3 files changed, 9 insertions, 9 deletions
diff --git a/include/llvm/CodeGen/InstrForest.h b/include/llvm/CodeGen/InstrForest.h
index 2e1e9ea179..66b9583421 100644
--- a/include/llvm/CodeGen/InstrForest.h
+++ b/include/llvm/CodeGen/InstrForest.h
@@ -24,7 +24,7 @@
 #ifndef LLVM_CODEGEN_INSTRFOREST_H
 #define LLVM_CODEGEN_INSTRFOREST_H
 
-#include "llvm/Support/Unique.h"
+#include "llvm/Support/NonCopyable.h"
 #include "llvm/Instruction.h"
 #include <hash_map>
 #include <hash_set>
@@ -128,7 +128,7 @@ MainTreeNode(BasicTreeNode* node) {
 }
 
 
-class InstrTreeNode: public Unique {
+class InstrTreeNode : public NonCopyableV {
 public:
   enum InstrTreeNodeType { NTInstructionNode,
 			   NTVRegListNode,
@@ -144,7 +144,7 @@ protected:
 public:
   /*ctor*/		InstrTreeNode	(InstrTreeNodeType nodeType,
 					 Value* _val);
-  /*dtor*/ virtual	~InstrTreeNode	();
+  /*dtor*/ virtual	~InstrTreeNode	() {}
   
   BasicTreeNode*	getBasicNode	()	 { return &basicNode; }
   
@@ -239,7 +239,7 @@ protected:
 //------------------------------------------------------------------------ 
 
 class InstrForest :
-  public Unique,
+  public NonCopyable,
   private hash_map<const Instruction*, InstructionNode*> {
   
 private:
diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index 5c6fb62928..36e11bc6d2 100644
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -17,7 +17,7 @@
 
 #include "llvm/CodeGen/InstrForest.h"
 #include "llvm/Support/DataTypes.h"
-#include "llvm/Support/Unique.h"
+#include "llvm/Support/NonCopyable.h"
 #include "llvm/CodeGen/TargetMachine.h"
 
 //---------------------------------------------------------------------------
@@ -177,7 +177,7 @@ MachineOperand::InitializeReg(unsigned int _regNum)
 //   opcode and set bits in opCodeMask for each of these flags.
 //---------------------------------------------------------------------------
 
-class MachineInstr : public Unique {
+class MachineInstr : public NonCopyable {
 private:
   MachineOpCode	opCode;
   OpCodeMask	opCodeMask;		// extra bits for variants of an opcode
@@ -187,7 +187,7 @@ public:
   /*ctor*/		MachineInstr	(MachineOpCode _opCode,
 					 OpCodeMask    _opCodeMask = 0x0);
   
-  /*dtor*/         	~MachineInstr	();
+  inline           	~MachineInstr	() {}
   
   const MachineOpCode	getOpCode	() const;
   
diff --git a/include/llvm/CodeGen/TargetMachine.h b/include/llvm/CodeGen/TargetMachine.h
index 0be7e54baf..141a484d90 100644
--- a/include/llvm/CodeGen/TargetMachine.h
+++ b/include/llvm/CodeGen/TargetMachine.h
@@ -12,7 +12,7 @@
 #ifndef LLVM_CODEGEN_TARGETMACHINE_H
 #define LLVM_CODEGEN_TARGETMACHINE_H
 
-#include "llvm/Support/Unique.h"
+#include "llvm/Support/NonCopyable.h"
 #include "llvm/Support/DataTypes.h"
 #include <string>
 
@@ -70,7 +70,7 @@ extern const MachineInstrInfo* TargetMachineInstrInfo;
 // 
 //---------------------------------------------------------------------------
 
-class TargetMachine: public Unique {
+class TargetMachine : public NonCopyableV {
 public:
   int		optSizeForSubWordData;
   int		intSize;