Skip to content
Snippets Groups Projects
Commit 6f9c2db8 authored by Andrew Johnson's avatar Andrew Johnson
Browse files

libCom: Revert 12374 which breaks MSVC++ builds

Both the Microsoft 2008 and 2010 compilers fail with this change.
parent 01276d95
No related branches found
No related tags found
No related merge requests found
......@@ -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 =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment