diff options
Diffstat (limited to 'ace/Cleanup.h')
| -rw-r--r-- | ace/Cleanup.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/ace/Cleanup.h b/ace/Cleanup.h index d288225a0a5..4cf7629ac4a 100644 --- a/ace/Cleanup.h +++ b/ace/Cleanup.h @@ -26,26 +26,6 @@ # endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/ACE_export.h" - -#if (defined (ACE_HAS_VERSIONED_NAMESPACE) \ - && ACE_HAS_VERSIONED_NAMESPACE == 1) \ - && !(defined (_MSC_VER) && _MSC_VER <= 1200) -// MSVC++ 6's preprocessor can't handle macro expansions required by -// the versioned namespace support. *sigh* - -# include "ace/Global_Macros.h" - -# define ACE_CLEANUP_DESTROYER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_cleanup_destroyer) - -#else - -# define ACE_CLEANUP_DESTROYER_NAME ace_cleanup_destroyer - -#endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ - - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class ACE_Cleanup * @@ -66,7 +46,7 @@ public: // Adapter for cleanup, used by ACE_Object_Manager. extern "C" ACE_Export -void ACE_CLEANUP_DESTROYER_NAME (ACE_Cleanup *, void *param = 0); +void ace_cleanup_destroyer (ACE_Cleanup *, void *param = 0); /** * @class ACE_Cleanup_Info @@ -133,8 +113,6 @@ private: ACE_Cleanup_Info_Node *registered_objects_; }; -ACE_END_VERSIONED_NAMESPACE_DECL - # if defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) # undef ACE_INLINE |