diff options
author | Sebastian Redl <sebastian.redl@getdesigned.at> | 2009-03-19 23:26:52 +0000 |
---|---|---|
committer | Sebastian Redl <sebastian.redl@getdesigned.at> | 2009-03-19 23:26:52 +0000 |
commit | 48fe63526e35ddaee7e98879596a569911f41319 (patch) | |
tree | ac51c35b589cd58106bb9afd41ad7ad20cb059a8 /include | |
parent | a24752ff43dc1ad8c18c5d9e78549c45f62b980e (diff) | |
download | external_llvm-48fe63526e35ddaee7e98879596a569911f41319.zip external_llvm-48fe63526e35ddaee7e98879596a569911f41319.tar.gz external_llvm-48fe63526e35ddaee7e98879596a569911f41319.tar.bz2 |
Fix the Win32 VS2008 build:
- Make type declarations match the struct/class keyword of the definition.
- Move AddSignalHandler into the namespace where it belongs.
- Correctly call functions from template base.
- Some other small changes.
With this patch, LLVM and Clang should build properly and with far less noise under VS2008.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67347 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r-- | include/llvm/CodeGen/ScheduleDAG.h | 2 | ||||
-rw-r--r-- | include/llvm/Support/CommandLine.h | 4 | ||||
-rw-r--r-- | include/llvm/User.h | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/include/llvm/CodeGen/ScheduleDAG.h b/include/llvm/CodeGen/ScheduleDAG.h index 685dc76..f258f6f 100644 --- a/include/llvm/CodeGen/ScheduleDAG.h +++ b/include/llvm/CodeGen/ScheduleDAG.h @@ -23,7 +23,7 @@ #include "llvm/ADT/PointerIntPair.h" namespace llvm { - struct SUnit; + class SUnit; class MachineConstantPool; class MachineFunction; class MachineModuleInfo; diff --git a/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h index def5ce7..1c6b333 100644 --- a/include/llvm/Support/CommandLine.h +++ b/include/llvm/Support/CommandLine.h @@ -833,8 +833,8 @@ class opt : public Option, typename ParserClass::parser_data_type(); if (Parser.parse(*this, ArgName, Arg, Val)) return true; // Parse error! - setValue(Val); - setPosition(pos); + this->setValue(Val); + this->setPosition(pos); return false; } diff --git a/include/llvm/User.h b/include/llvm/User.h index 69826c0..8a24406 100644 --- a/include/llvm/User.h +++ b/include/llvm/User.h @@ -84,6 +84,10 @@ public: void operator delete(void*, unsigned) { assert(0 && "Constructor throws?"); } + /// placement delete - required by std, but never called. + void operator delete(void*, unsigned, bool) { + assert(0 && "Constructor throws?"); + } protected: template <int Idx, typename U> static Use &OpFrom(const U *that) { return Idx < 0 |