diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-08-27 14:32:42 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-08-27 14:32:42 +0000 |
| commit | 841c3eb70aaa19491bc875f6a1b9b7ffcb055fca (patch) | |
| tree | 43c654ee013f9abbab20d29cec6589a64da04de6 /ace/Singleton.cpp | |
| parent | 7af27e8504af74232d8112f1bf4bf8ae7c4417f3 (diff) | |
| download | ATCD-841c3eb70aaa19491bc875f6a1b9b7ffcb055fca.tar.gz | |
(instance): removed full qualification of "instance_" in ACE_NEW_RETURN macro, because it confuses the Sun C++ 4.2 preprocessor
Diffstat (limited to 'ace/Singleton.cpp')
| -rw-r--r-- | ace/Singleton.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp index 33cf929c1c5..cb35833582f 100644 --- a/ace/Singleton.cpp +++ b/ace/Singleton.cpp @@ -163,9 +163,12 @@ ACE_TSS_Singleton<TYPE, LOCK>::instance (void) if (ACE_TSS_Singleton<TYPE, LOCK>::instance_ == 0) { - ACE_NEW_RETURN (ACE_TSS_Singleton<TYPE, LOCK>::instance_, - ACE_TSS<TYPE>, - 0); + // Please don't fully qualify "instance_" in the following + // statement. It confuses the Sun C++ 4.2 preprocessor: + // do { ACE_TSS_Singleton < TYPE = new LOCK > :: instance_ ; + // if ( ACE_TSS_Singleton < TYPE == 0 ) { ( * ( ___errno ( ) ) ) = + + ACE_NEW_RETURN (instance_, ACE_TSS<TYPE>, 0); #if 0 /* ACE_Object_Manager::at_thread_exit () is not implemented yet. */ // Register for destruction with ACE_Object_Manager. |