Fix problems compiling with G++ 4.x.x with -pedantic. Thanks to

Vladimir Merzliakov for the patch!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20513 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Instruction.h b/include/llvm/Instruction.h
index da0767d47f4706f507fdef7e79dc6f79c5d7a2f3..5a43a223b5c5960f1511105fc3355a8792d7d0e3 100644 (file)
--- a/include/llvm/Instruction.h
+++ b/include/llvm/Instruction.h
@@ -163,28 +163,28 @@ public:
   enum TermOps {       // These terminate basic blocks
 #define  FIRST_TERM_INST(N)             TermOpsBegin = N,
 #define HANDLE_TERM_INST(N, OPC, CLASS) OPC = N,
-#define   LAST_TERM_INST(N)             TermOpsEnd = N+1,
+#define   LAST_TERM_INST(N)             TermOpsEnd = N+1
 #include "llvm/Instruction.def"
   };
 
   enum BinaryOps {
 #define  FIRST_BINARY_INST(N)             BinaryOpsBegin = N,
 #define HANDLE_BINARY_INST(N, OPC, CLASS) OPC = N,
-#define   LAST_BINARY_INST(N)             BinaryOpsEnd = N+1,
+#define   LAST_BINARY_INST(N)             BinaryOpsEnd = N+1
 #include "llvm/Instruction.def"
   };
 
   enum MemoryOps {
 #define  FIRST_MEMORY_INST(N)             MemoryOpsBegin = N,
 #define HANDLE_MEMORY_INST(N, OPC, CLASS) OPC = N,
-#define   LAST_MEMORY_INST(N)             MemoryOpsEnd = N+1,
+#define   LAST_MEMORY_INST(N)             MemoryOpsEnd = N+1
 #include "llvm/Instruction.def"
   };
 
   enum OtherOps {
 #define  FIRST_OTHER_INST(N)             OtherOpsBegin = N,
 #define HANDLE_OTHER_INST(N, OPC, CLASS) OPC = N,
-#define   LAST_OTHER_INST(N)             OtherOpsEnd = N+1,
+#define   LAST_OTHER_INST(N)             OtherOpsEnd = N+1
 #include "llvm/Instruction.def"
   };
 };

diff --git a/include/llvm/Type.h b/include/llvm/Type.h
index 82b9905f358427998e4d083475d1af65644c96ee..5ffcec6e56f3fd9b954aac0c27290a99407a71bf 100644 (file)
--- a/include/llvm/Type.h
+++ b/include/llvm/Type.h
@@ -78,7 +78,7 @@ public:
 
     NumTypeIDs,                         // Must remain as last defined ID
     LastPrimitiveTyID = LabelTyID,
-    FirstDerivedTyID = FunctionTyID,
+    FirstDerivedTyID = FunctionTyID
   };
 
 private: