Eliminate use of NonCopyable so that doxygen documentation doesn't link

the Annotation classes with the noncopyable classes for no reason

llvm-svn: 5973

1 files changed, 4 insertions, 3 deletions

diff --git a/llvm/lib/Target/Sparc/PreSelection.cpp b/llvm/lib/Target/Sparc/PreSelection.cpp
index 216091787f1..20974e6daf3 100644
--- a/llvm/lib/Target/Sparc/PreSelection.cpp
+++ b/llvm/lib/Target/Sparc/PreSelection.cpp
@@ -52,15 +52,16 @@ namespace {
   // A single GlobalVariable is created for each constant in the pool
   // representing the memory for that constant.  
   // 
-  static AnnotationID CPFM_AID(
+  AnnotationID CPFM_AID(
                  AnnotationManager::getID("CodeGen::ConstantPoolForModule"));
 
-  class ConstantPoolForModule: private Annotation, public NonCopyable {
+  class ConstantPoolForModule : private Annotation {
     Module* myModule;
     std::map<const Constant*, GlobalVariable*> gvars;
     std::map<const Constant*, GlobalVariable*> origGVars;
     ConstantPoolForModule(Module* M);   // called only by annotation builder
-    ConstantPoolForModule();            // do not implement
+    ConstantPoolForModule();                      // DO NOT IMPLEMENT
+    void operator=(const ConstantPoolForModule&); // DO NOT IMPLEMENT
   public:
     static ConstantPoolForModule& get(Module* M) {
       ConstantPoolForModule* cpool =