epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

libCom: Revert 12374 which breaks MSVC++ builds

Browse Source 
Both the Microsoft 2008 and 2010 compilers fail with this change.
This commit is contained in:
Andrew Johnson
2012-11-30 13:32:25 -06:00
parent 01276d952f
commit 6f9c2db8a8
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,11 @@ public:
reference ( epicsSingleton & );
reference ( const reference & );
~reference ();
reference & operator = ( const 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 & );
TYPE * operator -> ();
const TYPE * operator -> () const;
TYPE & operator * ();
@@ -102,7 +106,7 @@ inline epicsSingleton < TYPE > :: reference ::
}
template < class TYPE >
class epicsSingleton < TYPE > :: reference &
typename epicsSingleton < TYPE > :: reference &
epicsSingleton < TYPE > :: reference ::
operator = ( const reference & ref )
{
@@ -195,14 +199,14 @@ void epicsSingleton < TYPE > ::
}
template < class TYPE >
inline class epicsSingleton < TYPE > :: reference
inline typename epicsSingleton < TYPE > :: reference
epicsSingleton < TYPE > :: getReference ()
{
return reference ( * this );
}
template < class TYPE >
inline const class epicsSingleton < TYPE > :: reference
inline const typename epicsSingleton < TYPE > :: reference
epicsSingleton < TYPE > :: getReference () const
{
epicsSingleton < TYPE > * pConstCastAway =