diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-10-11 08:27:12 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-10-11 08:27:12 +0000 |
| commit | e7261e0b17136d514ed2dec4d4f4b6f60fa716a2 (patch) | |
| tree | 2ffbe37c9c72290fab45a77bef0cb0393cf82a58 | |
| parent | 29a13cc5a04dadb98706fb1815a110230f5b5f92 (diff) | |
| download | ATCD-e7261e0b17136d514ed2dec4d4f4b6f60fa716a2.tar.gz | |
ChangeLogTag:Tue Oct 11 01:24:45 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/AV_Core.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Properties.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/LookupManager.h | 4 |
5 files changed, 20 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 39ec7ddcb81..91e3ebc8c66 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Tue Oct 11 01:24:45 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + From James Megquier <jmegq at radiance dot com> + * orbsvcs/orbsvcs/AV/AV_Core.h: + * orbsvcs/orbsvcs/Notify/Properties.h: + * orbsvcs/orbsvcs/Notify/RT_Properties.h: + * orbsvcs/tests/Notify/lib/LookupManager.h: + + Declare exported (i.e. default visibility) singleton templates + prior to typedefs that reference them. Prevents g++ 4.0 from + silently making their visibility hidden. [Bug 2260] + Tue Oct 11 07:14:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tests/AMI_Timeouts/timeout_client.cpp: diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index 8cb73123159..75cb061cf05 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -156,8 +156,6 @@ protected: CORBA::Boolean stop_run_; }; -typedef ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> TAO_AV_CORE; - #if defined (__BORLANDC__) # if !defined (TAO_AV_BUILD_DLL) # pragma option push -Jgx @@ -170,5 +168,7 @@ TAO_AV_SINGLETON_DECLARE (ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex) # endif #endif +typedef ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> TAO_AV_CORE; + #include /**/ "ace/post.h" #endif /* TAO_AV_CORE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index 8b8b61f19f5..e872da4d5de 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -141,10 +141,10 @@ protected: CosNotification::QoSProperties pc_qos_; }; -typedef TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX> TAO_Notify_PROPERTIES; - TAO_NOTIFY_SERV_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_Properties, TAO_SYNCH_MUTEX) +typedef TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX> TAO_Notify_PROPERTIES; + #if defined (__ACE_INLINE__) #include "Properties.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h index 3f9ae1f4950..31cffb6d9db 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h @@ -53,10 +53,10 @@ protected: RTCORBA::Current_var current_; }; -typedef TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX> TAO_Notify_RT_PROPERTIES; - TAO_RT_NOTIFY_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX) +typedef TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX> TAO_Notify_RT_PROPERTIES; + #if defined (__ACE_INLINE__) #include "RT_Properties.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h index 6cd7f1da60d..b7ebe49ef06 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h @@ -110,10 +110,10 @@ protected: TAO_Notify_Tests_Priority_Mapping *priority_mapping_; }; -typedef ACE_Singleton<TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX> _TAO_Notify_Tests_LookupManager; - TAO_NOTIFY_TEST_SINGLETON_DECLARE (ACE_Singleton, TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX) +typedef ACE_Singleton<TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX> _TAO_Notify_Tests_LookupManager; + #define LOOKUP_MANAGER _TAO_Notify_Tests_LookupManager::instance() #include /**/ "ace/post.h" |