*** empty log message ***

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

diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index c81eb87e73de4f71109d56c870c34ad0250d5a60..e208c5575ef3c92d49f588dde068ce792747c98e 100644 (file)
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -11,7 +11,7 @@
 
 #include "llvm/Target/MachineInstrInfo.h"
 #include "llvm/Annotation.h"
-#include <iterator>
+#include <Support/iterator>
 #include <Support/hash_set>
 class Instruction;
 using std::vector;
@@ -371,7 +371,7 @@ public:
   // Iterator to enumerate machine operands.
   // 
   template<class MITy, class VTy>
-  class ValOpIterator : public std::forward_iterator<VTy, ptrdiff_t> {
+  class ValOpIterator : public forward_iterator<VTy, ptrdiff_t> {
     unsigned i;
     MITy MI;
     
@@ -488,8 +488,8 @@ MachineInstr::getImplicitRef(unsigned int i)
 
 inline void
 MachineInstr::addImplicitRef(Value* val, 
-                             bool isDef=false,
-                             bool isDefAndUse=false)
+                             bool isDef,
+                             bool isDefAndUse)
 {
   implicitRefs.push_back(val);
   implicitIsDef.push_back(isDef);
@@ -499,8 +499,8 @@ MachineInstr::addImplicitRef(Value* val,
 inline void
 MachineInstr::setImplicitRef(unsigned int i,
                              Value* val, 
-                             bool isDef=false,
-                             bool isDefAndUse=false)
+                             bool isDef,
+                             bool isDefAndUse)
 {
   assert(i < implicitRefs.size() && "setImplicitRef() out of range!");
   implicitRefs[i] = val;

diff --git a/include/llvm/Target/TargetSchedInfo.h b/include/llvm/Target/TargetSchedInfo.h
index a08bd9981504da96d900fc81f93826d3a7d4674e..00d4b188dce5ed48fefb9039fad224bf4b204039 100644 (file)
--- a/include/llvm/Target/TargetSchedInfo.h
+++ b/include/llvm/Target/TargetSchedInfo.h
@@ -28,7 +28,7 @@ private:
   OpCodePair();                        // disable for now
 };
 
-namespace std {
+namespace HASH_NAMESPACE {
   template <> struct hash<OpCodePair> {
     size_t operator()(const OpCodePair& pair) const {
       return hash<long>()(pair.val);