From 9848151dd178bc656e3f4af3d96550eb06f688dc Mon Sep 17 00:00:00 2001
From: zimoch <zimoch>
Date: Tue, 26 Nov 2013 09:00:01 +0000
Subject: [PATCH] avoind typename and use class in templates to make some old
 compiler happy

---
 src/libCom/cxxTemplates/epicsSingleton.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/libCom/cxxTemplates/epicsSingleton.h b/src/libCom/cxxTemplates/epicsSingleton.h
index 25e503723..9a2d18acf 100644
--- a/src/libCom/cxxTemplates/epicsSingleton.h
+++ b/src/libCom/cxxTemplates/epicsSingleton.h
@@ -51,10 +51,7 @@ public:
         reference ( epicsSingleton & );
         reference ( const reference & );
         ~reference ();
-	// this somewhat convoluted reference of the return
-	// type ref through the epicsSingleton template is
-	// required for the archaic Tornado gnu compiler
-        typename epicsSingleton < TYPE > :: reference & 
+        reference & 
 	    operator = ( const reference & );
         TYPE * operator -> ();
         const TYPE * operator -> () const;
@@ -106,7 +103,7 @@ inline epicsSingleton < TYPE > :: reference ::
 }
 
 template < class TYPE >
-typename epicsSingleton < TYPE > :: reference & 
+class epicsSingleton < TYPE > :: reference & 
     epicsSingleton < TYPE > :: reference :: 
         operator = ( const reference & ref )
 {
@@ -199,14 +196,14 @@ void epicsSingleton < TYPE > ::
 }
 
 template < class TYPE >
-inline typename epicsSingleton < TYPE > :: reference 
+inline class epicsSingleton < TYPE > :: reference 
     epicsSingleton < TYPE > :: getReference ()
 {
     return reference ( * this );
 }
 
 template < class TYPE >
-inline const typename epicsSingleton < TYPE > :: reference 
+inline const class epicsSingleton < TYPE > :: reference 
     epicsSingleton < TYPE > :: getReference () const
 {
     epicsSingleton < TYPE > * pConstCastAway =