diff options
Diffstat (limited to 'ace/Shared_Memory_Pool.h')
| -rw-r--r-- | ace/Shared_Memory_Pool.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/ace/Shared_Memory_Pool.h b/ace/Shared_Memory_Pool.h index 996cde2b490..1fb46a5cc9c 100644 --- a/ace/Shared_Memory_Pool.h +++ b/ace/Shared_Memory_Pool.h @@ -16,20 +16,24 @@ #include /**/ "ace/pre.h" -#include "ace/ACE_export.h" +#ifdef ACE_MEMORY_BUILD_DLL +# include "ace/ACE_Memory_export.h" +#else +# include "ace/ACE_export.h" +# define ACE_Memory_Export ACE_Export +#endif /* ACE_MEMORY_BUILD_DLL */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (ACE_LACKS_SYSV_SHMEM) - #include "ace/ACE.h" #include "ace/Event_Handler.h" #include "ace/Signal.h" -#include "ace/os_include/sys/os_mman.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +#if !defined (ACE_LACKS_SYSV_SHMEM) + +#include "ace/os_include/sys/os_mman.h" /** * @class ACE_Shared_Memory_Pool_Options @@ -39,7 +43,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * This should be a nested class, but that breaks too many * compilers. */ -class ACE_Export ACE_Shared_Memory_Pool_Options +class ACE_Memory_Export ACE_Shared_Memory_Pool_Options { public: /// Initialization method. @@ -78,7 +82,7 @@ public: * provides more powerful features, such as persistent backing store * and greatly scalability. */ -class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler +class ACE_Memory_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler { public: typedef ACE_Shared_Memory_Pool_Options OPTIONS; @@ -199,9 +203,6 @@ protected: /// properly. virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); }; - -ACE_END_VERSIONED_NAMESPACE_DECL - #endif /* !ACE_LACKS_SYSV_SHMEM */ #include /**/ "ace/post.h" |