Remove unnecessary use of NonCopyable


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7641 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp b/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
index ef08a5c..598bff9 100644
--- a/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
+++ b/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
@@ -21,7 +21,6 @@
 #include "llvm/Support/CFG.h"
 #include "Support/TarjanSCCIterator.h"
 #include "Support/Statistic.h"
-#include "Support/NonCopyable.h"
 #include "Support/STLExtras.h"
 #include "Support/hash_map"
 #include "Support/hash_set"
@@ -116,14 +115,14 @@
 /// and all that use any node.
 ///--------------------------------------------------------------------------
 
-class ModRefInfoBuilder: public InstVisitor<ModRefInfoBuilder>,
-                         public NonCopyable
-{
+class ModRefInfoBuilder : public InstVisitor<ModRefInfoBuilder> {
   const DSGraph&            funcGraph;
   const FunctionModRefInfo& funcModRef;
   ModRefTable&              modRefTable;
 
-  ModRefInfoBuilder(); // do not implement
+  ModRefInfoBuilder();                         // DO NOT IMPLEMENT
+  ModRefInfoBuilder(const ModRefInfoBuilder&); // DO NOT IMPLEMENT
+  void operator=(const ModRefInfoBuilder&);    // DO NOT IMPLEMENT
 
 public:
   /*ctor*/      ModRefInfoBuilder(const DSGraph&  _funcGraph,
diff --git a/lib/Analysis/DataStructure/Parallelize.cpp b/lib/Analysis/DataStructure/Parallelize.cpp
index 46fbcc7..81a5252 100644
--- a/lib/Analysis/DataStructure/Parallelize.cpp
+++ b/lib/Analysis/DataStructure/Parallelize.cpp
@@ -45,7 +45,6 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Support/Cilkifier.h"
-#include "Support/NonCopyable.h"
 #include "Support/Statistic.h"
 #include "Support/STLExtras.h"
 #include "Support/hash_set"
@@ -280,9 +279,7 @@
 // useful parallelism.
 //---------------------------------------------------------------------------- 
 
-class FindParallelCalls: public InstVisitor<FindParallelCalls>,
-                         public NonCopyable
-{
+class FindParallelCalls : public InstVisitor<FindParallelCalls> {
   typedef hash_set<CallInst*>           DependentsSet;
   typedef DependentsSet::iterator       Dependents_iterator;
   typedef DependentsSet::const_iterator Dependents_const_iterator;
@@ -296,6 +293,8 @@
                      CallInst*      root,
                      DependentsSet& depsOfRoot);
 
+  FindParallelCalls(const FindParallelCalls &); // DO NOT IMPLEMENT
+  void operator=(const FindParallelCalls&);     // DO NOT IMPLEMENT
 public:
   std::vector<CallInst*> parallelCalls;