epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

libCom: Removed epicsSingleton workaround

Browse Source 
This undoes commit 11565, "workaround for archaic T202 g++ bug"
which doesn't actually seem to be necessary for T202 compilation.
It also replaces 'typename' with 'class', for another compiler.

Modification provided by Dirk Zimoch.
This commit is contained in:
Andrew Johnson
2012-11-16 16:14:13 -06:00
parent 28c7fe12f3
commit 6fd9fb3066
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libCom/cxxTemplates/epicsSingleton.h
View File

@@ -51,11 +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 &
operator = ( const reference & );
reference & operator = ( const reference & );
TYPE * operator -> ();
const TYPE * operator -> () const;
TYPE & operator * ();
@@ -106,7 +102,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 +195,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 =