diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-10-05 19:40:35 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-10-05 19:40:35 +0200 |
| commit | 8829191dda28a35e81d9fbe6b7c29abc9bb16524 (patch) | |
| tree | d8891f2368d1f05fa98092485041ff47354439c1 /ACE/ace/Global_Macros.h | |
| parent | 999c2d14947c0e6f67061972cc8971789c5acbb4 (diff) | |
| download | ATCD-8829191dda28a35e81d9fbe6b7c29abc9bb16524.tar.gz | |
Remove ACE_STATIC_CONSTANT because there is no compiler anymore that lacks the support for static constants
* ACE/ace/Global_Macros.h:
* ACE/ace/Truncate.h:
Diffstat (limited to 'ACE/ace/Global_Macros.h')
| -rw-r--r-- | ACE/ace/Global_Macros.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 5d97d382da5..065709daa9c 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -867,7 +867,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC #endif /* ACE_WIN32 */ -// Some useful abstrations for expressions involving +// Some useful abstractions for expressions involving // ACE_Allocator.malloc (). The difference between ACE_NEW_MALLOC* // with ACE_ALLOCATOR* is that they call constructors also. @@ -1034,16 +1034,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool # define ACE_PAGEFILE_MEMORY_POOL ACE_Pagefile_Memory_Pool -// Work around compilers that don't like in-class static integral -// constants. Constants in this case are meant to be compile-time -// constants so that they may be used as template arguments, for -// example. BOOST provides a similar macro. -#ifndef ACE_LACKS_STATIC_IN_CLASS_CONSTANTS -# define ACE_STATIC_CONSTANT(TYPE, ASSIGNMENT) static TYPE const ASSIGNMENT -#else -# define ACE_STATIC_CONSTANT(TYPE, ASSIGNMENT) enum { ASSIGNMENT } -#endif /* !ACE_LACKS_STATIC_IN_CLASS_CONSTANTS */ - #include /**/ "ace/post.h" #endif /*ACE_GLOBAL_MACROS_H*/ |