diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-24 11:05:47 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-24 11:05:47 +0000 |
| commit | b1c1a996e7b667f81e4447c7fe7a660b09cb52ad (patch) | |
| tree | 550e5a13efab47f5a2526ac5d60ecfdcdc6abd47 /TAO/tao/TAO_Singleton_Manager.h | |
| parent | 6dfaf4ef7e39575f7e51708889c003d74ff7b88e (diff) | |
| download | ATCD-b1c1a996e7b667f81e4447c7fe7a660b09cb52ad.tar.gz | |
ChangeLogTag:Thu Nov 24 03:01:29 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/TAO_Singleton_Manager.h')
| -rw-r--r-- | TAO/tao/TAO_Singleton_Manager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h index 7e52b9e3630..3e8b3d729ad 100644 --- a/TAO/tao/TAO_Singleton_Manager.h +++ b/TAO/tao/TAO_Singleton_Manager.h @@ -34,11 +34,11 @@ // MSVC++ 6's preprocessor can't handle macro expansions required by // the versioned namespace support. *sigh* -# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _TAO_Singleton_Manager_cleanup_destroyer) +# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _TAO_Singleton_Manager_cleanup_destroyer) #else -# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME TAO_Singleton_Manager_cleanup_destroyer +# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME TAO_Singleton_Manager_cleanup_destroyer #endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ @@ -46,7 +46,7 @@ /// ACE_Object_Manager. extern "C" void -TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME (void *, void *); +TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME (void *, void *); TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -76,7 +76,7 @@ typedef void (*TAO_unexpected_handler)(void); class TAO_Export TAO_Singleton_Manager : public ACE_Object_Manager_Base { - friend void TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME (void *, void *); + friend void ::TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME (void *, void *); public: /// Explicitly initialize. |