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 | c9453fa9a8437101b087df3eb9ae2da9db1f0b6e (patch) | |
| tree | 550e5a13efab47f5a2526ac5d60ecfdcdc6abd47 /TAO/tao/TAO_Singleton_Manager.cpp | |
| parent | 19803029f50dbba5d851692c1292af3f875641fb (diff) | |
| download | ATCD-c9453fa9a8437101b087df3eb9ae2da9db1f0b6e.tar.gz | |
ChangeLogTag:Thu Nov 24 03:01:29 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/TAO_Singleton_Manager.cpp')
| -rw-r--r-- | TAO/tao/TAO_Singleton_Manager.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp index f871ae6504d..2d5ecbb1971 100644 --- a/TAO/tao/TAO_Singleton_Manager.cpp +++ b/TAO/tao/TAO_Singleton_Manager.cpp @@ -28,9 +28,15 @@ ACE_RCSID (tao, TAO_Singleton_Manager, "$Id$") + extern "C" void -TAO_SINGLETON_MANAGER_CLEANUP_DESTROY_NAME (void *, void *) +TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME (void *, void *) { +#if defined (TAO_HAS_VERSIONED_NAMESPACE) \ + && TAO_HAS_VERSIONED_NAMESPACE == 1 + using namespace TAO_VERSIONED_NAMESPACE_NAME; +#endif /* TAO_HAS_VERSIONED_NAMESPACE */ + if (TAO_Singleton_Manager::instance_) { (void) TAO_Singleton_Manager::instance ()->fini (); @@ -187,7 +193,7 @@ TAO_Singleton_Manager::init (int register_with_object_manager) if (register_with_object_manager == 1 && ACE_Object_Manager::at_exit ( this, - (ACE_CLEANUP_FUNC) TAO_Singleton_Manager_cleanup_destroyer, + (ACE_CLEANUP_FUNC) TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME, 0) != 0) return -1; |