diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-09 09:35:14 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-09 09:35:14 +0000 |
| commit | c3efbc7f642bfc5bbbc5dfa3f936af67bfc470af (patch) | |
| tree | 6d9f4e402723ba3e080b549079a78db541816f81 /ACE/ace/Global_Macros.h | |
| parent | 6dff767d910eda93c9b1e3f184019f94cb30efd6 (diff) | |
| download | ATCD-c3efbc7f642bfc5bbbc5dfa3f936af67bfc470af.tar.gz | |
Thu Sep 9 09:29:30 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/CDR_Base.h:
* ace/CDR_Base.cpp:
* ace/DEV.h:
* ace/FILE.h:
* ace/Global_Macros.h:
* ace/INET_Addr.inl:
* ace/Malloc_T.h:
* ace/Malloc_T.inl:
* ace/Malloc_T.cpp:
* ace/SOCK_Dgram_Bcast.cpp:
* ace/SSL/SSL_SOCK.h:
* ace/Shared_Memory_Pool.cpp:
* ace/Sock_Connect.cpp:
* ace/config-aix-5.x.h:
* ace/config-doxygen.h:
* ace/config-g++-common.h:
* ace/config-hpux-11.00.h:
* ace/config-icc-common.h:
* ace/config-integritySCA.h:
* ace/config-linux-common.h:
* ace/config-macros.h:
* ace/config-mvs.h:
* ace/config-openvms.h:
* ace/config-suncc-common.h:
* ace/config-sunos5.5.h:
* ace/config-sunos5.6.h:
* ace/config-tandem-nsk-mips-v2.h:
* ace/config-tandem-nsk-mips-v3.h:
* ace/config-win32-borland.h:
* ace/config-win32-dmc.h:
* ace/config-win32-ghs.h:
* ace/config-win32-msvc-10.h:
* ace/config-win32-msvc-7.h:
* ace/config-win32-msvc-8.h:
* ace/config-win32-msvc-9.h:
* examples/IOStream/server/iostream_server.h:
* examples/IPC_SAP/SOCK_SAP/C-inserver.cpp:
* examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp:
* examples/Reactor/Misc/test_event_handler_t.cpp:
* tests/Basic_Types_Test.cpp:
* tests/Conn_Test.cpp:
* tests/Message_Queue_Test.cpp:
* tests/SSL/Thread_Pool_Reactor_SSL_Test.h:
* tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp:
Cleanup, all compilers support templated typedefs
* ace/config-cray.h:
* ace/config-cxx-common.h:
Removed these files, obsolete
Diffstat (limited to 'ACE/ace/Global_Macros.h')
| -rw-r--r-- | ACE/ace/Global_Macros.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 814be2ee1f9..5d11f24ae0a 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -125,7 +125,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () != 0) { ACTION; } \ else { REACTION; } -#endif /* !ACE_GUARD_ACTION */ +#endif /* !ACE_GUARD_ACTION */ #if !defined (ACE_GUARD_REACTION) #define ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, REACTION) \ ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ;, REACTION) @@ -137,7 +137,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #if !defined (ACE_GUARD_RETURN) #define ACE_GUARD_RETURN(MUTEX, OBJ, LOCK, RETURN) \ ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, return RETURN) -#endif /* !ACE_GUARD_RETURN */ +#endif /* !ACE_GUARD_RETURN */ #if !defined (ACE_WRITE_GUARD) # define ACE_WRITE_GUARD(MUTEX,OBJ,LOCK) \ ACE_Write_Guard< MUTEX > OBJ (LOCK); \ @@ -157,7 +157,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \ ACE_Read_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) return RETURN; -#endif /* !ACE_READ_GUARD_RETURN */ +#endif /* !ACE_READ_GUARD_RETURN */ // FUZZ: enable check_for_ACE_Guard // ---------------------------------------------------------------- @@ -997,10 +997,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector # define ACE_UPIPE_STREAM ACE_UPIPE_Stream -// Handle ACE_FILE_* -# define ACE_FILE_CONNECTOR ACE_FILE_Connector -# define ACE_FILE_STREAM ACE_FILE_IO - // Handle ACE_*_Memory_Pool. # define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool # define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool |