Eliminated the Unique class in favor of NonCopyable and NonCopyableV

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

1 files changed, 3 insertions, 3 deletions

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;