4 files changed, 6 insertions, 8 deletions
diff --git a/include/llvm/Transforms/ChangeAllocations.h b/include/llvm/Transforms/ChangeAllocations.h
index 08339cd64e..4c36b2d4c0 100644
--- a/include/llvm/Transforms/ChangeAllocations.h
+++ b/include/llvm/Transforms/ChangeAllocations.h
@@ -13,7 +13,7 @@
 #include "llvm/Transforms/Pass.h"
 class TargetData;
 
-class LowerAllocations : public ConcretePass<LowerAllocations> {
+class LowerAllocations : public ConcretePass {
   Method *MallocMeth;   // Methods in the module we are processing
   Method *FreeMeth;     // Initialized by doPassInitializationVirt
 
diff --git a/include/llvm/Transforms/Instrumentation/TraceValues.h b/include/llvm/Transforms/Instrumentation/TraceValues.h
index 8f4ee1d981..cf27a344ce 100644
--- a/include/llvm/Transforms/Instrumentation/TraceValues.h
+++ b/include/llvm/Transforms/Instrumentation/TraceValues.h
@@ -70,7 +70,7 @@ void            InsertCodeToTraceValues (Method* method,
                                          bool traceMethodExits);
 
 
-class InsertTraceCode : public ConcretePass<InsertTraceCode> {
+class InsertTraceCode : public ConcretePass {
   bool TraceBasicBlockExits, TraceMethodExits;
 public:
   InsertTraceCode(bool traceBasicBlockExits, bool traceMethodExits)
diff --git a/include/llvm/Transforms/Pass.h b/include/llvm/Transforms/Pass.h
index c6ba84ec5d..f7cc17cca8 100644
--- a/include/llvm/Transforms/Pass.h
+++ b/include/llvm/Transforms/Pass.h
@@ -113,15 +113,13 @@ struct Pass {
 
 
 //===----------------------------------------------------------------------===//
-// ConcretePass<t> class - This is used by implementations of passes to fill in
-// boiler plate code.  SubClass should be a concrete class that is derived from
-// ConcretePass.
+// ConcretePass class - This is used by implementations of passes to fill in
+// boiler plate code.
 //
 // Deriving from this class is good because if new methods are added in the 
 // future, code for your pass won't have to change to stub out the unused
 // functionality.
 //
-template<class SubClass>
 struct ConcretePass : public Pass {
 
   // doPassInitializationVirt - Default to success.
@@ -143,7 +141,7 @@ struct ConcretePass : public Pass {
 // SubClass should be a concrete class that is derived from StatelessPass.
 //
 template<class SubClass>
-struct StatelessPass : public ConcretePass<SubClass> {
+struct StatelessPass : public ConcretePass {
 
   //===--------------------------------------------------------------------===//
   // The externally useful entry points - These are specialized to avoid the
diff --git a/include/llvm/Transforms/PrintModulePass.h b/include/llvm/Transforms/PrintModulePass.h
index 90cd369f7b..0e2cee1599 100644
--- a/include/llvm/Transforms/PrintModulePass.h
+++ b/include/llvm/Transforms/PrintModulePass.h
@@ -11,7 +11,7 @@
 #include "llvm/Transforms/Pass.h"
 #include "llvm/Assembly/Writer.h"
 
-class PrintModulePass : public ConcretePass<PrintModulePass> {
+class PrintModulePass : public ConcretePass {
   string Banner;          // String to print before each method
   ostream *Out;           // ostream to print on
   bool DeleteStream;      // Delete the ostream in our dtor?