4 files changed, 6 insertions, 20 deletions
diff --git a/include/cppunit/extensions/AutoRegisterSuite.h b/include/cppunit/extensions/AutoRegisterSuite.h
index ccf6997..24c2f2c 100644
--- a/include/cppunit/extensions/AutoRegisterSuite.h
+++ b/include/cppunit/extensions/AutoRegisterSuite.h
@@ -23,7 +23,7 @@ namespace CppUnit {
  * \see CPPUNIT_TEST_SUITE_REGISTRATION, CPPUNIT_TEST_SUITE_NAMED_REGISTRATION
  * \see CppUnit::TestFactoryRegistry.
  */
-template<typename TestCaseType>
+template<class TestCaseType>
 class AutoRegisterSuite
 {
 public:
diff --git a/include/cppunit/extensions/Orthodox.h b/include/cppunit/extensions/Orthodox.h
index 5fc7aab..08c6dd1 100644
--- a/include/cppunit/extensions/Orthodox.h
+++ b/include/cppunit/extensions/Orthodox.h
@@ -38,7 +38,7 @@ namespace CppUnit {
  */
 
 
-template <typename ClassUnderTest> class Orthodox : public TestCase
+template <class ClassUnderTest> class Orthodox : public TestCase
 {
 public:
                     Orthodox () : TestCase ("Orthodox") {}
@@ -52,7 +52,7 @@ protected:
 
 
 // Run an orthodoxy test
-template <typename ClassUnderTest> void Orthodox<ClassUnderTest>::runTest ()
+template <class ClassUnderTest> void Orthodox<ClassUnderTest>::runTest ()
 {
     // make sure we have a default constructor
     ClassUnderTest   a, b, c;
@@ -82,7 +82,7 @@ template <typename ClassUnderTest> void Orthodox<ClassUnderTest>::runTest ()
 
 
 // Exercise a call
-template <typename ClassUnderTest> 
+template <class ClassUnderTest> 
 ClassUnderTest Orthodox<ClassUnderTest>::call (ClassUnderTest object)
 {
     return object;
diff --git a/include/cppunit/extensions/TestSuiteBuilder.h b/include/cppunit/extensions/TestSuiteBuilder.h
index f75e430..ae1c6df 100644
--- a/include/cppunit/extensions/TestSuiteBuilder.h
+++ b/include/cppunit/extensions/TestSuiteBuilder.h
@@ -19,7 +19,7 @@ namespace CppUnit {
  * MyTestSuiteName.myTestName
  * \see TestNamer.
  */
-template<typename Fixture>
+template<class Fixture>
 class TestSuiteBuilder
 {
 public:
@@ -74,20 +74,6 @@ public:
       addTest( test );
   }
 
-  template<typename ExceptionType>
-  void addTestCallerForException( std::string methodName, 
-                                  TestMethod testMethod, 
-                                  Fixture *fixture,
-                                  ExceptionType *dummyPointer )
-  {
-      Test *test = new TestCaller<Fixture,ExceptionType>( 
-                                   makeTestName( methodName ), 
-                                   testMethod,
-                                   fixture);
-      addTest( test );
-  }
-
-
   std::string makeTestName( const std::string &methodName )
   {
     return m_testNamer.getTestNameFor( methodName );
diff --git a/include/cppunit/extensions/TestSuiteFactory.h b/include/cppunit/extensions/TestSuiteFactory.h
index 567812d..11605a5 100644
--- a/include/cppunit/extensions/TestSuiteFactory.h
+++ b/include/cppunit/extensions/TestSuiteFactory.h
@@ -10,7 +10,7 @@ namespace CppUnit {
   /*! \brief TestFactory for TestFixture that implements a static suite() method.
    * \see AutoRegisterSuite.
    */
-  template<typename TestCaseType>
+  template<class TestCaseType>
   class TestSuiteFactory : public TestFactory
   {
   public: