diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 2003-01-17 20:36:49 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 2003-01-17 20:36:49 +0000 |
| commit | 72d9d13ced6775b71fddcff67612f2b8d482bebe (patch) | |
| tree | 116700dbc2e41ff2406e135904f2edacbd04fcba | |
| parent | 0dec65279459ee7ef5ee994ed71d2910d2158bd2 (diff) | |
| download | ATCD-72d9d13ced6775b71fddcff67612f2b8d482bebe.tar.gz | |
Fri Jan 17 14:22:48 2003 Chris Cleeland <cleeland_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Properties.cpp | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a1bdd5645e9..00c25d06dde 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Jan 17 14:22:48 2003 Chris Cleeland <cleeland_c@ociweb.com> + + * orbsvcs/orbsvcs/Notify/Properties.cpp: Fixed explicit + instantiation to instantiate TAO_Singleton rather than + ACE_Singleton. This fixes the RH71_Explicit_Templates build. + Fri Jan 17 08:34:57 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h: Removed an extra diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index 6018b876659..d8a141b39fc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -20,12 +20,13 @@ TAO_NS_Properties::~TAO_NS_Properties () { } +#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton<TAO_NS_Properties, TAO_SYNCH_MUTEX>; +template class TAO_Singleton<TAO_NS_Properties, TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton<TAO_NS_Properties, TAO_SYNCH_MUTEX> +#pragma instantiate TAO_Singleton<TAO_NS_Properties, TAO_SYNCH_MUTEX> #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |