From 6dfaf4ef7e39575f7e51708889c003d74ff7b88e Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Thu, 24 Nov 2005 09:48:55 +0000 Subject: ChangeLogTag:Thu Nov 24 01:38:57 2005 Ossama Othman --- ChangeLog | 65 +++++++++++++++++++++++++++ ace/Atomic_Op.h | 2 +- ace/Auto_Ptr.h | 3 ++ ace/Barrier.h | 4 ++ ace/Base_Thread_Adapter.h | 2 + ace/CDR_Stream.h | 8 ++++ ace/Cleanup_Strategies_T.cpp | 2 + ace/Dev_Poll_Reactor.h | 2 + ace/Functor_String.h | 3 +- ace/High_Res_Timer.cpp | 13 ++++++ ace/LSOCK_Connector.inl | 2 +- ace/Local_Name_Space_T.h | 8 ++++ ace/Log_Msg.h | 2 +- ace/Malloc.h | 5 +++ ace/Malloc_Allocator.h | 4 ++ ace/Message_Queue.h | 9 ++++ ace/OS_Memory.h | 8 +++- ace/OS_NS_Thread.cpp | 6 +-- ace/OS_NS_Thread.h | 10 ++--- ace/OS_NS_errno.h | 4 +- ace/OS_NS_math.inl | 2 +- ace/OS_NS_netdb.cpp | 13 +++++- ace/OS_NS_netdb.h | 2 +- ace/OS_NS_sys_msg.h | 4 ++ ace/OS_NS_time.h | 5 +-- ace/OS_main.cpp | 4 ++ ace/Object_Manager.h | 12 +++++ ace/Parse_Node.cpp | 12 ++--- ace/Ping_Socket.cpp | 4 ++ ace/Proactor.cpp | 7 ++- ace/Proactor.h | 4 ++ ace/Profile_Timer.cpp | 8 ++++ ace/Profile_Timer.inl | 18 +++++++- ace/SOCK_Dgram_Mcast.cpp | 4 ++ ace/SOCK_Dgram_Mcast.h | 4 ++ ace/SOCK_Dgram_Mcast.inl | 7 ++- ace/SPIPE_Stream.h | 4 ++ ace/SSL/SSL_Asynch_BIO.cpp | 5 +++ ace/SSL/SSL_Context.cpp | 8 ++-- ace/Select_Reactor_T.cpp | 4 +- ace/Service_Config.h | 4 +- ace/Service_Templates.cpp | 1 - ace/Sock_Connect.cpp | 14 +++--- ace/Svc_Conf_l.cpp | 11 +++++ ace/Svc_Conf_y.cpp | 6 +++ ace/Thread_Manager.cpp | 4 +- ace/Time_Value.h | 13 ++++-- ace/Timeprobe.h | 8 +++- ace/Timer_Hash_T.h | 4 ++ ace/Timer_List.cpp | 8 +++- ace/Timer_Queue.cpp | 8 +++- ace/config-lite.h | 5 ++- bin/MakeProjectCreator/config/global.features | 3 +- bin/fuzz.pl | 42 ++++++++++++++++- 54 files changed, 361 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6526c038b0b..03d188033e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,68 @@ +Thu Nov 24 01:38:57 2005 Ossama Othman + + * bin/fuzz.pl: + + Added a test that flags common versioned namespace related + errors/misuses. + + * bin/MakeProjectCreator/config/global.features: + + Disable versioned namespace support by default. + + * ace/Atomic_Op.h: + * ace/Auto_Ptr.h: + * ace/Barrier.h: + * ace/Base_Thread_Adapter.h: + * ace/CDR_Stream.h: + * ace/Cleanup_Strategies_T.cpp: + * ace/Dev_Poll_Reactor.h: + * ace/Functor_String.h: + * ace/High_Res_Timer.cpp: + * ace/LSOCK_Connector.inl: + * ace/Local_Name_Space_T.h: + * ace/Log_Msg.h: + * ace/Malloc.h: + * ace/Malloc_Allocator.h: + * ace/Message_Queue.h: + * ace/OS_Memory.h: + * ace/OS_NS_Thread.cpp: + * ace/OS_NS_Thread.h: + * ace/OS_NS_errno.h: + * ace/OS_NS_math.inl: + * ace/OS_NS_netdb.cpp: + * ace/OS_NS_netdb.h: + * ace/OS_NS_sys_msg.h: + * ace/OS_NS_time.h: + * ace/OS_main.cpp: + * ace/Object_Manager.h: + * ace/Parse_Node.cpp: + * ace/Ping_Socket.cpp: + * ace/Proactor.cpp: + * ace/Proactor.h: + * ace/Profile_Timer.cpp: + * ace/Profile_Timer.inl: + * ace/SOCK_Dgram_Mcast.cpp: + * ace/SOCK_Dgram_Mcast.h: + * ace/SOCK_Dgram_Mcast.inl: + * ace/SPIPE_Stream.h: + * ace/Select_Reactor_T.cpp: + * ace/Service_Config.h: + * ace/Service_Templates.cpp: + * ace/Sock_Connect.cpp: + * ace/Svc_Conf_l.cpp: + * ace/Svc_Conf_y.cpp: + * ace/Thread_Manager.cpp: + * ace/Time_Value.h: + * ace/Timeprobe.h: + * ace/Timer_Hash_T.h: + * ace/Timer_List.cpp: + * ace/Timer_Queue.cpp: + * ace/config-lite.h: + * ace/SSL/SSL_Asynch_BIO.cpp: + * ace/SSL/SSL_Context.cpp: + + Corrected build errors in versioned namespace builds. + Wed Nov 23 19:54:12 UTC 2005 Johnny Willemsen * include/makeinclude/wrapper_macros.GNU: diff --git a/ace/Atomic_Op.h b/ace/Atomic_Op.h index 3cd7dad0d86..991625cd32f 100644 --- a/ace/Atomic_Op.h +++ b/ace/Atomic_Op.h @@ -245,7 +245,7 @@ private: static long (*exchange_add_fn_) (volatile long *, long); }; -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h index eca987863a2..78d3319d392 100644 --- a/ace/Auto_Ptr.h +++ b/ace/Auto_Ptr.h @@ -68,6 +68,8 @@ protected: X *p_; }; +ACE_END_VERSIONED_NAMESPACE_DECL + #if !defined (ACE_LACKS_AUTO_PTR) && \ defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ (ACE_HAS_STANDARD_CPP_LIBRARY != 0) @@ -96,6 +98,7 @@ public: #endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** * @brief Implements the draft C++ standard auto_ptr abstraction. diff --git a/ace/Barrier.h b/ace/Barrier.h index f90fa7bb163..95a7ae3fe5f 100644 --- a/ace/Barrier.h +++ b/ace/Barrier.h @@ -50,10 +50,14 @@ public: void dump (void) const {} }; +ACE_END_VERSIONED_NAMESPACE_DECL + #else /* ACE_HAS_THREADS */ #include "ace/Condition_Thread_Mutex.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + struct ACE_Threads_Export ACE_Sub_Barrier { // = Initialization. diff --git a/ace/Base_Thread_Adapter.h b/ace/Base_Thread_Adapter.h index 66848a365e3..b0dd61cb573 100644 --- a/ace/Base_Thread_Adapter.h +++ b/ace/Base_Thread_Adapter.h @@ -33,6 +33,8 @@ // MSVC++ 6's preprocessor can't handle macro expansions required by // the versioned namespace support. *sigh* +#include "ace/Global_Macros.h" + # define ACE_THREAD_ADAPTER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_thread_adapter) #else diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h index 168052d0b8f..c755ba2e80e 100644 --- a/ace/CDR_Stream.h +++ b/ace/CDR_Stream.h @@ -62,6 +62,8 @@ #endif /* ! ACE_LITTLE_ENDIAN */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_Char_Codeset_Translator; class ACE_WChar_Codeset_Translator; @@ -1172,10 +1174,14 @@ extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, ACE_CString &x); +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "ace/CDR_Stream.inl" #else /* __ACE_INLINE__ */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // Not used by CORBA or TAO extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Char x); @@ -1262,6 +1268,8 @@ extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, ACE_CDR::WChar*& x); +ACE_END_VERSIONED_NAMESPACE_DECL + #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/ace/Cleanup_Strategies_T.cpp b/ace/Cleanup_Strategies_T.cpp index f17f181f121..10804ba21ca 100644 --- a/ace/Cleanup_Strategies_T.cpp +++ b/ace/Cleanup_Strategies_T.cpp @@ -90,4 +90,6 @@ ACE_Null_Cleanup_Strategy::cleanup (CONTAINER &, return 0; } +ACE_END_VERSIONED_NAMESPACE_DECL + #endif /* ACE_CLEANUP_STRATEGIES_T_CPP */ diff --git a/ace/Dev_Poll_Reactor.h b/ace/Dev_Poll_Reactor.h index 5e9f054a6d9..4b0a94c873e 100644 --- a/ace/Dev_Poll_Reactor.h +++ b/ace/Dev_Poll_Reactor.h @@ -64,6 +64,8 @@ #if defined (ACE_HAS_DEV_POLL) struct pollfd; +#elif defined (ACE_HAS_EVENT_POLL) +struct epoll_event; #endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ace/Functor_String.h b/ace/Functor_String.h index 712a7dcc1f8..6c68b026bd1 100644 --- a/ace/Functor_String.h +++ b/ace/Functor_String.h @@ -129,9 +129,10 @@ public: const ACE_WString &rhs) const; }; +#endif /*ACE_USES_WCHAR*/ + ACE_END_VERSIONED_NAMESPACE_DECL -#endif /*ACE_USES_WCHAR*/ #if defined (__ACE_INLINE__) #include "ace/Functor_String.inl" #endif /* __ACE_INLINE__ */ diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp index 6e0df4c8174..ae8e7b3b21a 100644 --- a/ace/High_Res_Timer.cpp +++ b/ace/High_Res_Timer.cpp @@ -27,6 +27,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer) +ACE_END_VERSIONED_NAMESPACE_DECL + // For Intel platforms, a scale factor is required for // ACE_OS::gethrtime. We'll still set this to one to prevent division // by zero errors. @@ -38,23 +40,34 @@ ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer) # include "ace/Recursive_Thread_Mutex.h" # include "ace/Object_Manager.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // Initialize the global_scale_factor_ to 1. The first // ACE_High_Res_Timer instance construction will override this // value. /* static */ ACE_UINT32 ACE_High_Res_Timer::global_scale_factor_ = 1u; +ACE_END_VERSIONED_NAMESPACE_DECL + #else /* ! (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER) || ACE_HAS_HI_RES_TIMER */ + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // A scale_factor of 1000 converts nanosecond ticks to microseconds. // That is, on these platforms, 1 tick == 1 nanosecond. /* static */ ACE_UINT32 ACE_High_Res_Timer::global_scale_factor_ = 1000u; + +ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ! (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER) || ACE_HAS_HI_RES_TIMER */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // This is used to tell if the global_scale_factor_ has been // set, and if high resolution timers are supported. /* static */ diff --git a/ace/LSOCK_Connector.inl b/ace/LSOCK_Connector.inl index 65579ad7e83..f9cdffbf6dc 100644 --- a/ace/LSOCK_Connector.inl +++ b/ace/LSOCK_Connector.inl @@ -24,4 +24,4 @@ ACE_LSOCK_Connector::connect (ACE_LSOCK_Stream &new_stream, return result; } -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h index 3580be7a05e..14ed9377b30 100644 --- a/ace/Local_Name_Space_T.h +++ b/ace/Local_Name_Space_T.h @@ -33,15 +33,23 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /// to callers. typedef ACE_Unbounded_Set ACE_WSTRING_SET; +ACE_END_VERSIONED_NAMESPACE_DECL + // Simplify later usage by defining typedefs. #if (1) # include "ace/Hash_Map_Manager_T.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> MAP_MANAGER; +ACE_END_VERSIONED_NAMESPACE_DECL #else # include "ace/Map_Manager.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Map_Manager MAP_MANAGER; +ACE_END_VERSIONED_NAMESPACE_DECL #endif /* 0 */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + /// @deprecated Deprecated typedefs. Use the map's traits instead. typedef MAP_MANAGER::ITERATOR MAP_ITERATOR; typedef MAP_MANAGER::ENTRY MAP_ENTRY; diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h index 498864c3439..1772e7f46e9 100644 --- a/ace/Log_Msg.h +++ b/ace/Log_Msg.h @@ -721,7 +721,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL // MSVC++ 6's preprocessor can't handle macro expansions required by // the versioned namespace support. *sigh* -# define ACE_TSS_CLEANUP_NAME ACE_ ## ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _TSS_cleanup) +# define ACE_TSS_CLEANUP_NAME ACE_PREPROC_CONCATENATE(ACE_,ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _TSS_cleanup)) #else diff --git a/ace/Malloc.h b/ace/Malloc.h index fd8c67e5654..8bd7f838496 100644 --- a/ace/Malloc.h +++ b/ace/Malloc.h @@ -201,6 +201,9 @@ struct ACE_Export ACE_Malloc_Stats /// Number of blocks in use ACE_INT ninuse_; }; + +ACE_END_VERSIONED_NAMESPACE_DECL + # define ACE_MALLOC_STATS(X) X #else # define ACE_MALLOC_STATS(X) @@ -215,6 +218,8 @@ struct ACE_Export ACE_Malloc_Stats # define ACE_MALLOC_PADDING 1 #endif /* ACE_MALLOC_PADDING */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + union ACE_max_align_info { int (*i)(); diff --git a/ace/Malloc_Allocator.h b/ace/Malloc_Allocator.h index 4fecb2a3d6a..f70555a74da 100644 --- a/ace/Malloc_Allocator.h +++ b/ace/Malloc_Allocator.h @@ -34,6 +34,8 @@ #endif /* ACE_HAS_MALLOC_STATS */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class ACE_New_Allocator * @@ -133,6 +135,8 @@ protected: size_t offset_; }; +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ace/Malloc_Allocator.inl" #endif /* __ACE_INLINE__ */ diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h index 28f55cba9ee..71e9ab0176b 100644 --- a/ace/Message_Queue.h +++ b/ace/Message_Queue.h @@ -220,6 +220,8 @@ protected: }; +ACE_END_VERSIONED_NAMESPACE_DECL + // Include the templates here. #include "ace/Message_Queue_T.h" @@ -228,6 +230,8 @@ protected: # include "ace/Null_Mutex.h" # include "ace/Null_Condition.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class ACE_Message_Queue_Vx * @@ -411,8 +415,13 @@ private: int options_; }; + +ACE_END_VERSIONED_NAMESPACE_DECL + #endif /* VXWORKS */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + #if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0) /** * @class ACE_Message_Queue_NT diff --git a/ace/OS_Memory.h b/ace/OS_Memory.h index f11aca10679..771fbcb8c5d 100644 --- a/ace/OS_Memory.h +++ b/ace/OS_Memory.h @@ -54,12 +54,16 @@ # define ACE_REALLOC_FUNC ::realloc #endif +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + #if defined (ACE_HAS_OLD_MALLOC) -typedef char *ACE_MALLOC_T; +typedef char * ACE_MALLOC_T; #else -typedef void *ACE_MALLOC_T; +typedef void * ACE_MALLOC_T; #endif /* ACE_HAS_OLD_MALLOC */ +ACE_END_VERSIONED_NAMESPACE_DECL + // ============================================================================ // ACE_NEW macros // diff --git a/ace/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp index a0c0565122f..720b5d0e241 100644 --- a/ace/OS_NS_Thread.cpp +++ b/ace/OS_NS_Thread.cpp @@ -27,7 +27,7 @@ ACE_RCSID (ace, extern "C" void ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args) { - ACE_OS::mutex_lock_cleanup (args); + ACE_VERSIONED_NAMESPACE_NAME::ACE_OS::mutex_lock_cleanup (args); } @@ -3995,14 +3995,14 @@ ACE_OS::thr_create (ACE_THR_FUNC func, #if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) ACE_NEW_RETURN (thread_args, ACE_OS_Thread_Adapter (func, args, - (ACE_THR_C_FUNC) ace_thread_adapter, + (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME, ACE_OS_Object_Manager::seh_except_selector(), ACE_OS_Object_Manager::seh_except_handler()), -1); #else ACE_NEW_RETURN (thread_args, ACE_OS_Thread_Adapter (func, args, - (ACE_THR_C_FUNC) ace_thread_adapter), + (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME), -1); #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ diff --git a/ace/OS_NS_Thread.h b/ace/OS_NS_Thread.h index 208f1b96a09..4e19de31800 100644 --- a/ace/OS_NS_Thread.h +++ b/ace/OS_NS_Thread.h @@ -188,7 +188,7 @@ struct ACE_Export ACE_mutexattr_t typedef ACE_thread_t ACE_hthread_t; typedef ACE_mutex_t ACE_thread_mutex_t; -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_END_VERSIONED_NAMESPACE_DECL # define THR_CANCEL_DISABLE 0 # define THR_CANCEL_ENABLE 0 @@ -417,7 +417,7 @@ public: # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # endif /* defined (ACE_WIN32) */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_END_VERSIONED_NAMESPACE_DECL // These need to be different values, neither of which can be 0... # define USYNC_THREAD 1 @@ -556,7 +556,7 @@ public: ACE_cond_t waiting_important_writer_; }; -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_END_VERSIONED_NAMESPACE_DECL # elif defined (ACE_HAS_PTHREADS_UNIX98_EXT) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -1179,7 +1179,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # if defined (ACE_HAS_THR_C_FUNC) // This is necessary to work around nasty problems with MVS C++. extern "C" ACE_Export void ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args); -# define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ace_mutex_lock_cleanup_adapter, (void *) A); +# define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME, (void *) A); # define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A) # elif defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CLEANUP) // Though we are defining a extern "C" function to match the prototype of @@ -1187,7 +1187,7 @@ extern "C" ACE_Export void ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args); // /usr/include/pthread.h. So this macro generates a warning under Solaris // with SunCC. This is a bug in the Solaris header file. extern "C" ACE_Export void ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args); -# define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ace_mutex_lock_cleanup_adapter, (void *) A); +# define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME, (void *) A); # define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A) # else # define ACE_PTHREAD_CLEANUP_PUSH(A) diff --git a/ace/OS_NS_errno.h b/ace/OS_NS_errno.h index e8e6ce9f536..740a176f706 100644 --- a/ace/OS_NS_errno.h +++ b/ace/OS_NS_errno.h @@ -77,8 +77,6 @@ private: static DWORD errno_key_; }; -ACE_END_VERSIONED_NAMESPACE_DECL - # define errno (* (ACE_CE_Errno::instance ())) #endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ @@ -88,6 +86,8 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_ERRNO_TYPE int #endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ +ACE_END_VERSIONED_NAMESPACE_DECL + # if defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) # undef ACE_INLINE diff --git a/ace/OS_NS_math.inl b/ace/OS_NS_math.inl index 6c1ed7b724f..b14599eab50 100644 --- a/ace/OS_NS_math.inl +++ b/ace/OS_NS_math.inl @@ -26,4 +26,4 @@ namespace ACE_OS { } // ACE_OS namespace -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_netdb.cpp b/ace/OS_NS_netdb.cpp index 497f2924789..41073340e1a 100644 --- a/ace/OS_NS_netdb.cpp +++ b/ace/OS_NS_netdb.cpp @@ -187,12 +187,16 @@ ACE_OS::gethostbyname_r (const char *name, hostent *result, #endif /* VXWORKS */ +ACE_END_VERSIONED_NAMESPACE_DECL + // Include if_arp so that getmacaddr can use the // arp structure. #if defined (sun) # include /**/ #endif +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + int ACE_OS::getmacaddress (struct macaddr_node_t *node) { @@ -369,9 +373,14 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) #endif } +ACE_END_VERSIONED_NAMESPACE_DECL + # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) # include "ace/OS_NS_Thread.h" # include "ace/Object_Manager_Base.h" + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + int ACE_OS::netdb_acquire (void) { @@ -387,6 +396,8 @@ ACE_OS::netdb_release (void) ACE_OS_Object_Manager::preallocated_object[ ACE_OS_Object_Manager::ACE_OS_MONITOR_LOCK]); } -# endif /* defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) */ ACE_END_VERSIONED_NAMESPACE_DECL + +# endif /* defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) */ + diff --git a/ace/OS_NS_netdb.h b/ace/OS_NS_netdb.h index 13c28d722b9..fbcb5580cb9 100644 --- a/ace/OS_NS_netdb.h +++ b/ace/OS_NS_netdb.h @@ -140,7 +140,7 @@ namespace ACE_OS } /* namespace ACE_OS */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_END_VERSIONED_NAMESPACE_DECL # if defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) diff --git a/ace/OS_NS_sys_msg.h b/ace/OS_NS_sys_msg.h index 37b4743d43b..4dcd9be5461 100644 --- a/ace/OS_NS_sys_msg.h +++ b/ace/OS_NS_sys_msg.h @@ -33,6 +33,8 @@ #endif #define ACE_EXPORT_MACRO ACE_Export +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + namespace ACE_OS { //@{ @name A set of wrappers for System V message queues. @@ -61,6 +63,8 @@ namespace ACE_OS { } /* namespace ACE_OS */ +ACE_END_VERSIONED_NAMESPACE_DECL + # if defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) # undef ACE_INLINE diff --git a/ace/OS_NS_time.h b/ace/OS_NS_time.h index 3f45bef6e44..a0be9688f7a 100644 --- a/ace/OS_NS_time.h +++ b/ace/OS_NS_time.h @@ -215,7 +215,6 @@ typedef long long ACE_hrtime_t; # endif /* ! ACE_HAS_HI_RES_TIMER || ACE_LACKS_LONGLONG_T */ # endif /* ACE_WIN32 */ - # if defined (ACE_HRTIME_T_IS_BASIC_TYPE) # define ACE_HRTIME_CONVERSION(VAL) (VAL) # define ACE_HRTIME_TO_U64(VAL) ACE_U_LongLong(VAL) @@ -224,8 +223,6 @@ typedef long long ACE_hrtime_t; # define ACE_HRTIME_TO_U64(VAL) (VAL) # endif -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - namespace ACE_OS { @@ -361,7 +358,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL && defined (ghs) \ && defined (ACE_HAS_PENTIUM) \ && !defined (ACE_WIN32) -#define ACE_GETHRTIME_NAME ACE_ ## ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _gethrtime) +#define ACE_GETHRTIME_NAME ACE_PREPROC_CONCATENATE(ACE_,ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _gethrtime)) #else # define ACE_GETHRTIME_NAME ACE_gethrtime #endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ diff --git a/ace/OS_main.cpp b/ace/OS_main.cpp index c94728d7326..605c22f2a6e 100644 --- a/ace/OS_main.cpp +++ b/ace/OS_main.cpp @@ -117,12 +117,16 @@ ace_os_main_i (ACE_Main_Base &mbase, int argc, char *argv[]) /* user's entry poi # else /* ACE_HAS_WINCE */ +ACE_END_VERSIONED_NAMESPACE_DECL + // CE only gets a command line string; no argv. So we need to convert it // when the main entrypoint expects argc/argv. ACE_ARGV supports this. # include "ace/OS_NS_string.h" # include "ace/ACE.h" # include "ace/ARGV.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + int ACE_Main_Base::run (HINSTANCE, HINSTANCE, LPWSTR lpCmdLine, diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index 7255b985614..eb96167e617 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -24,17 +24,27 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations. class ACE_Object_Manager_Preallocations; class ACE_Sig_Adapter; class ACE_Sig_Set; + +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_Mutex; class ACE_Null_Mutex; class ACE_Thread_Mutex; class ACE_Recursive_Thread_Mutex; class ACE_RW_Thread_Mutex; +ACE_END_VERSIONED_NAMESPACE_DECL + # include "ace/Recursive_Thread_Mutex.h" #endif /* ACE_MT_SAFE */ @@ -439,7 +449,9 @@ ACE_END_VERSIONED_NAMESPACE_DECL // We can't use the ACE_SVC_FACTORY_DECLARE macro here because this // needs to be in the ACE_Export context rather than the // ACE_Svc_Export context. +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Service_Object; +ACE_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DECLARE (ACE, ACE_Service_Manager) #endif /* ! ACE_LACKS_ACE_SVCCONF */ diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp index e21fa47b40e..0a7e5b4ad09 100644 --- a/ace/Parse_Node.cpp +++ b/ace/Parse_Node.cpp @@ -520,11 +520,11 @@ ACE_Function_Node::make_func_name (ACE_TCHAR const * func_name) // name as is done in the ACE macros. Otherwise, leave the function // name as is. - static ACE_TCHAR const make_prefix = ACE_LIB_TEXT ("_make_"); + static ACE_TCHAR const make_prefix[] = ACE_LIB_TEXT ("_make_"); static size_t const make_prefix_len = sizeof (make_prefix) / sizeof (make_prefix[0]); - if (ACE_OS::strncmp (make, func_name, make_len) == 0) + if (ACE_OS::strncmp (make_prefix, func_name, make_prefix_len) == 0) { static ACE_TCHAR const versioned_namespace_name[] = ACE_LIB_TEXT (ACE_VERSIONED_NAMESPACE_NAME_STRING) ACE_LIB_TEXT("_") ; @@ -541,13 +541,13 @@ ACE_Function_Node::make_func_name (ACE_TCHAR const * func_name) // @note Variable length array lengths are only supported by // conforming/modern compilers. - ACE_TCHAR mangled_func_name[len] = { 0 }; + ACE_TCHAR mangled_func_name[len]; ACE_OS::snprintf (mangled_func_name, len, - make_prefix - versioned_namespace_name - ACE_LIB_TEXT ("%s"), + ACE_LIB_TEXT ("%s%s%s"), + make_prefix, + versioned_namespace_name, func_name + make_prefix_len); return ACE::strnew (mangled_func_name); diff --git a/ace/Ping_Socket.cpp b/ace/Ping_Socket.cpp index 810a14408d5..23bff4cb52a 100644 --- a/ace/Ping_Socket.cpp +++ b/ace/Ping_Socket.cpp @@ -23,6 +23,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE (ACE_Ping_Socket) +ACE_END_VERSIONED_NAMESPACE_DECL + //--------------------------------------------------------------------------- // Better to arrange some os_include/netinet/ip.h and // os_include/netinet/icmp.h files ? @@ -76,6 +78,8 @@ struct icmp #endif /* #if ! defined (ACE_WIN32) */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + int const ICMP_MIN = 8; // Minimal size of ICMP packet, header only int const ICMP_DATA_LENGTH = 56; // For ICMP data with Echo request ACE_Time_Value const ACE_Ping_Socket::time_default_ (0, 500000); diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp index 0aaead3d025..f418b386a57 100644 --- a/ace/Proactor.cpp +++ b/ace/Proactor.cpp @@ -1191,12 +1191,15 @@ template class auto_ptr; #pragma instanstiate auto_ptr #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_END_VERSIONED_NAMESPACE_DECL + #else /* !ACE_WIN32 || !ACE_HAS_AIO_CALLS */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_Proactor * -ACE_Proactor::instance (size_t threads) +ACE_Proactor::instance (size_t /* threads */) { - ACE_UNUSED_ARG (threads); return 0; } diff --git a/ace/Proactor.h b/ace/Proactor.h index 3bc0a1a83d3..b88d0769a40 100644 --- a/ace/Proactor.h +++ b/ace/Proactor.h @@ -635,6 +635,8 @@ private: ACE_Proactor &operator= (const ACE_Proactor &); }; +ACE_END_VERSIONED_NAMESPACE_DECL + # if defined (__ACE_INLINE__) # include "ace/Proactor.inl" # endif /* __ACE_INLINE__ */ @@ -644,6 +646,8 @@ private: # include "ace/os_include/os_stddef.h" # include "ace/os_include/os_signal.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_Time_Value; class ACE_Export ACE_Proactor diff --git a/ace/Profile_Timer.cpp b/ace/Profile_Timer.cpp index c5d93d3f88d..2cf96dc40c7 100644 --- a/ace/Profile_Timer.cpp +++ b/ace/Profile_Timer.cpp @@ -264,8 +264,12 @@ ACE_Profile_Timer::elapsed_time (ACE_Elapsed_Time &et) return 0; } +ACE_END_VERSIONED_NAMESPACE_DECL + #elif defined (ACE_WIN32) /* defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE) */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + void ACE_Profile_Timer::dump (void) const { @@ -370,8 +374,12 @@ ACE_Profile_Timer::subtract (timeval &tdiff, timeval &t1, timeval &t0) } # endif /* ACE_HAS_GETRUSAGE */ +ACE_END_VERSIONED_NAMESPACE_DECL + #else +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + void ACE_Profile_Timer::dump (void) const { diff --git a/ace/Profile_Timer.inl b/ace/Profile_Timer.inl index b43bb910ece..6ef5aa45af3 100644 --- a/ace/Profile_Timer.inl +++ b/ace/Profile_Timer.inl @@ -8,11 +8,11 @@ #if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32) -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - # if defined (ACE_HAS_PRUSAGE_T) # include "ace/OS_NS_stropts.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE int ACE_Profile_Timer::start (void) { @@ -31,7 +31,13 @@ ACE_Profile_Timer::stop (void) PIOCUSAGE, &this->end_usage_); } + +ACE_END_VERSIONED_NAMESPACE_DECL + # elif defined (ACE_HAS_GETRUSAGE) + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE int ACE_Profile_Timer::start (void) { @@ -54,10 +60,14 @@ ACE_Profile_Timer::stop (void) return 0; } +ACE_END_VERSIONED_NAMESPACE_DECL + # endif /* ACE_HAS_PRUSAGE_T */ #elif defined (ACE_WIN32) +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE ACE_Profile_Timer::~ACE_Profile_Timer (void) { @@ -87,8 +97,12 @@ ACE_Profile_Timer::stop (void) return 0; } +ACE_END_VERSIONED_NAMESPACE_DECL + #else +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE int ACE_Profile_Timer::start (void) { diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp index 7661b8b975e..cde3a99c24f 100644 --- a/ace/SOCK_Dgram_Mcast.cpp +++ b/ace/SOCK_Dgram_Mcast.cpp @@ -32,6 +32,8 @@ ACE_RCSID (ace, #define IMR_MULTIADDR imr_multiaddr #endif /* ! defined (IMR_MULTIADDR) */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // Helper (inline) functions. class ACE_SDM_helpers { @@ -988,3 +990,5 @@ ACE_SOCK_Dgram_Mcast::clear_subs_list (void) #endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */ return result; } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h index bfd47c52f36..1019b1d6dd0 100644 --- a/ace/SOCK_Dgram_Mcast.h +++ b/ace/SOCK_Dgram_Mcast.h @@ -42,6 +42,8 @@ # endif /* ACE_SDM_LOCK */ #endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class ACE_SOCK_Dgram_Mcast * @@ -410,6 +412,8 @@ private: }; +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ace/SOCK_Dgram_Mcast.inl" #endif /* __ACE_INLINE__ */ diff --git a/ace/SOCK_Dgram_Mcast.inl b/ace/SOCK_Dgram_Mcast.inl index 3244f21b078..bf3574cfd54 100644 --- a/ace/SOCK_Dgram_Mcast.inl +++ b/ace/SOCK_Dgram_Mcast.inl @@ -1,6 +1,9 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE int ACE_SOCK_Dgram_Mcast::set_option (int option, char optval) @@ -45,3 +48,5 @@ ACE_SOCK_Dgram_Mcast::send (const iovec iov[], this->send_addr_, flags); } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h index 5146217c529..9a94216ae40 100644 --- a/ace/SPIPE_Stream.h +++ b/ace/SPIPE_Stream.h @@ -24,6 +24,8 @@ #include "ace/ACE.h" #include "ace/OS_NS_stropts.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class ACE_SPIPE_Stream * @@ -159,6 +161,8 @@ private: ACE_SPIPE_Addr remote_addr_; }; +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ace/SPIPE_Stream.inl" #endif /* __ACE_INLINE__ */ diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp index 93dedffa878..162e084a459 100644 --- a/ace/SSL/SSL_Asynch_BIO.cpp +++ b/ace/SSL/SSL_Asynch_BIO.cpp @@ -12,6 +12,11 @@ ACE_RCSID (ACE_SSL, #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) +# if defined (ACE_HAS_VERSIONED_NAMESPACE) \ + && ACE_HAS_VERSIONED_NAMESPACE == 1 +using namespace ACE_VERSIONED_NAMESPACE_NAME; +# endif /* ACE_HAS_VERSIONED_NAMESPACE */ + static BIO_METHOD methods_ACE = { BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER, diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp index f91b1a627f7..f3505cce1e2 100644 --- a/ace/SSL/SSL_Context.cpp +++ b/ace/SSL/SSL_Context.cpp @@ -6,7 +6,6 @@ #include "SSL_Context.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Mutex.h" #include "ace/Guard_T.h" #include "ace/Object_Manager.h" #include "ace/Log_Msg.h" @@ -17,6 +16,7 @@ #include "ace/OS_NS_string.h" #ifdef ACE_HAS_THREADS +# include "ace/Mutex.h" # include "ace/Auto_Ptr.h" # include "ace/OS_NS_Thread.h" #endif /* ACE_HAS_THREADS */ @@ -101,7 +101,7 @@ extern "C" unsigned long ACE_SSL_THREAD_ID_NAME (void) { - return (unsigned long) ACE_OS::thr_self (); + return (unsigned long) ACE_VERSIONED_NAMESPACE_NAME::ACE_OS::thr_self (); } } #endif /* ACE_HAS_THREADS */ @@ -546,8 +546,6 @@ ACE_SSL_Context::dh_params (const char *file_name, return 0; } -ACE_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -564,3 +562,5 @@ template ACE_Singleton * ACE_Singleton::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index 5901e2b7b2e..34469975f4d 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -22,8 +22,6 @@ // For timer_queue_ #include "ace/Recursive_Thread_Mutex.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - /* * ACE Reactor specialization hook. */ @@ -40,6 +38,8 @@ ACE_RCSID (ace, Select_Reactor_T, "$Id$") +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_ALLOC_HOOK_DEFINE(ACE_Select_Reactor_T) #if defined (ACE_WIN32) diff --git a/ace/Service_Config.h b/ace/Service_Config.h index df560eb8345..41f69edbe1e 100644 --- a/ace/Service_Config.h +++ b/ace/Service_Config.h @@ -40,8 +40,6 @@ class ACE_Reactor; class ACE_Thread_Manager; class ACE_DLL; -ACE_END_VERSIONED_NAMESPACE_DECL - #if (ACE_USES_CLASSIC_SVC_CONF == 1) #define ACE_DYNAMIC_SERVICE_DIRECTIVE(ident, libpathname, objectclass, parameters) \ ACE_LIB_TEXT ("dynamic ") \ @@ -76,6 +74,8 @@ class ACE_Svc_Conf_Param; class ACE_XML_Svc_Conf; #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ +ACE_END_VERSIONED_NAMESPACE_DECL + extern "C" { typedef ACE_Service_Object *(*ACE_SERVICE_ALLOCATOR) (ACE_Service_Object_Exterminator *); diff --git a/ace/Service_Templates.cpp b/ace/Service_Templates.cpp index c064bbdce45..a859c368148 100644 --- a/ace/Service_Templates.cpp +++ b/ace/Service_Templates.cpp @@ -94,4 +94,3 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp index fd24d041b03..d582f492aa1 100644 --- a/ace/Sock_Connect.cpp +++ b/ace/Sock_Connect.cpp @@ -51,13 +51,13 @@ extern "C" { # include "ace/Object_Manager.h" # endif /* ACE_HAS_THREADS */ -namespace ACE +namespace { // private: // Used internally so not exported. /// Does this box have ipv6 turned on? - int ipv6_enabled_ = -1; + int ace_ipv6_enabled = -1; } #endif /* ACE_HAS_IPV6 */ @@ -1496,30 +1496,30 @@ int ACE::ipv6_enabled (void) { #if defined (ACE_HAS_IPV6) - if (ACE::ipv6_enabled_ == -1) + if (ace_ipv6_enabled == -1) { // Perform Double-Checked Locking Optimization. ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Static_Object_Lock::instance (), 0)); - if (ACE::ipv6_enabled_ == -1) + if (ace_ipv6_enabled == -1) { // Determine if the kernel has IPv6 support by attempting to // create a PF_INET6 socket and see if it fails. ACE_HANDLE s = ACE_OS::socket (PF_INET6, SOCK_DGRAM, 0); if (s == ACE_INVALID_HANDLE) { - ACE::ipv6_enabled_ = 0; + ace_ipv6_enabled = 0; } else { - ACE::ipv6_enabled_ = 1; + ace_ipv6_enabled = 1; ACE_OS::closesocket (s); } } } - return ACE::ipv6_enabled_; + return ace_ipv6_enabled; #else /* ACE_HAS_IPV6 */ return 0; #endif /* !ACE_HAS_IPV6 */ diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp index 7abadc0b117..dfa5de9645b 100644 --- a/ace/Svc_Conf_l.cpp +++ b/ace/Svc_Conf_l.cpp @@ -104,11 +104,15 @@ /* Size of default input buffer. */ #define ACE_YY_BUF_SIZE 16384 +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + typedef struct ace_yy_buffer_state *ACE_YY_BUFFER_STATE; extern int ace_yyleng; extern FILE *ace_yyin, *ace_yyout; +ACE_END_VERSIONED_NAMESPACE_DECL + #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 @@ -142,6 +146,8 @@ extern FILE *ace_yyin, *ace_yyout; #if (ACE_USES_CLASSIC_SVC_CONF == 1) +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want * flex-generated scanners to compile on their own). @@ -509,6 +515,9 @@ static ACE_TCHAR *ace_yy_last_accepting_cpos; #define ACE_YY_RESTORE_ACE_YY_MORE_OFFSET ACE_TCHAR *ace_yytext; #define INITIAL 0 + +ACE_END_VERSIONED_NAMESPACE_DECL + // $Id$ // Sample lexical analysis for regular expression subset. Must be // compiled with FLEX and an ANSI C++ compiler. @@ -587,7 +596,9 @@ ACE_YY_MALLOC_DECL #else #if __STDC__ #ifndef __cplusplus +ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/OS_NS_stdlib.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL #endif #else /* Just try to get by without declaring the routines. This will fail diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp index deeb98403de..d18774268d8 100644 --- a/ace/Svc_Conf_y.cpp +++ b/ace/Svc_Conf_y.cpp @@ -300,7 +300,9 @@ static const short ace_yycheck[] = # define ACE_YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # else # if defined (__STDC__) || defined (__cplusplus) +ACE_END_VERSIONED_NAMESPACE_DECL # include /* INFRINGES ON USER NAME SPACE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL # define ACE_YYSIZE_T size_t # endif # define ACE_YYSTACK_ALLOC malloc @@ -383,7 +385,9 @@ union ace_yyalloc #endif #if ! defined (ACE_YYSIZE_T) # if defined (__STDC__) || defined (__cplusplus) +ACE_END_VERSIONED_NAMESPACE_DECL # include /* INFRINGES ON USER NAME SPACE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL # define ACE_YYSIZE_T size_t # endif #endif @@ -463,7 +467,9 @@ while (0) #if ACE_YYDEBUG # ifndef ACE_YYFPRINTF +ACE_END_VERSIONED_NAMESPACE_DECL # include /* INFRINGES ON USER NAME SPACE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL # define ACE_YYFPRINTF ACE_OS::fprintf # endif diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp index 57f8cf2973b..c0b86bef841 100644 --- a/ace/Thread_Manager.cpp +++ b/ace/Thread_Manager.cpp @@ -588,7 +588,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func, ACE_NEW_RETURN (thread_args, ACE_Thread_Adapter (func, args, - (ACE_THR_C_FUNC) ace_thread_adapter, + (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME, this, new_thr_desc.get (), ACE_OS_Object_Manager::seh_except_selector(), @@ -598,7 +598,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func, ACE_NEW_RETURN (thread_args, ACE_Thread_Adapter (func, args, - (ACE_THR_C_FUNC) ace_thread_adapter, + (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME, this, new_thr_desc.get ()), -1); diff --git a/ace/Time_Value.h b/ace/Time_Value.h index ee852be7588..3bc85b078f9 100644 --- a/ace/Time_Value.h +++ b/ace/Time_Value.h @@ -52,11 +52,11 @@ typedef struct timespec timespec_t; // needed for ACE_UINT64 #include "ace/Basic_Types.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - // This forward declaration is needed by the set() and FILETIME() functions #if defined (ACE_LACKS_LONGLONG_T) +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_U_LongLong; +ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_LONGLONG_T */ // ------------------------------------------------------------------- @@ -80,6 +80,9 @@ class ACE_Export ACE_U_LongLong; // - Steve Huston, 23-Aug-2004 extern "C++" { #endif + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_Export ACE_Time_Value { public: @@ -333,6 +336,8 @@ private: timeval tv_; }; +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ace/Time_Value.inl" #endif /* __ACE_INLINE__ */ @@ -342,14 +347,14 @@ private: #endif #if defined (__MINGW32__) +ACE_BEGIN_VERSIONED_NAMESPACE_DECL // The MingW linker has problems with the exported statics // zero and max_time with these two statics the linker will be able to // resolve the static exported symbols. static const ACE_Time_Value& __zero_time = ACE_Time_Value::zero; static const ACE_Time_Value& __max_time = ACE_Time_Value::max_time; -#endif /* __MINGW32__ */ - ACE_END_VERSIONED_NAMESPACE_DECL +#endif /* __MINGW32__ */ #include /**/ "ace/post.h" diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h index c2319014db8..a78619f6e76 100644 --- a/ace/Timeprobe.h +++ b/ace/Timeprobe.h @@ -113,6 +113,8 @@ public: ACE_thread_t thread_; }; +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ace/Timeprobe.inl" #endif /* __ACE_INLINE__ */ @@ -122,6 +124,8 @@ public: #include "ace/Singleton.h" #include "ace/Timeprobe_T.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // If ACE_MT_TIMEPROBES is defined, use a Thread_Mutex to lock the // internal state of ACE_Timerprobe. This allows multiple threads to // use the same ACE_Timerprobe. @@ -150,8 +154,8 @@ typedef ACE_Timeprobe_Ex # endif /* ACE_TSS_TIMEPROBES */ ACE_SINGLETON_DECLARE (ACE_TIMEPROBE_SINGLETON_TYPE, \ - ACE_TIMEPROBE_WITH_LOCKING, \ - ACE_TIMEPROBE_SINGLETON_LOCK_TYPE) + ACE_TIMEPROBE_WITH_LOCKING, \ + ACE_TIMEPROBE_SINGLETON_LOCK_TYPE) typedef ACE_TIMEPROBE_SINGLETON_TYPE ACE_TIMEPROBE_SINGLETON; diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h index 2b6e7944438..587a8178ae7 100644 --- a/ace/Timer_Hash_T.h +++ b/ace/Timer_Hash_T.h @@ -22,6 +22,8 @@ #include "ace/Free_List.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declaration. template class ACE_Timer_Hash_T; @@ -312,6 +314,8 @@ private: ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Hash_T &)) }; +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES) #include "ace/Timer_Hash_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */ diff --git a/ace/Timer_List.cpp b/ace/Timer_List.cpp index feb7633bb68..4d82a2065a2 100644 --- a/ace/Timer_List.cpp +++ b/ace/Timer_List.cpp @@ -10,9 +10,10 @@ ACE_RCSID(ace, Timer_List, "$Id$") #include "ace/Timer_Hash.h" #include "ace/Timer_List_T.cpp" +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Timer_List_T< ACE_Event_Handler*, @@ -30,9 +31,14 @@ ACE_Timer_List_Iterator_T< ACE_Event_Handler_Handle_Timeout_Upcall, ACE_Null_Mutex>, ACE_Null_Mutex>; + +ACE_END_VERSIONED_NAMESPACE_DECL + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Timer_List_T, ACE_SYNCH_RECURSIVE_MUTEX>; template class ACE_Timer_List_Iterator_T, ACE_SYNCH_RECURSIVE_MUTEX>; diff --git a/ace/Timer_Queue.cpp b/ace/Timer_Queue.cpp index 4c52a52bb6b..240a8caf66a 100644 --- a/ace/Timer_Queue.cpp +++ b/ace/Timer_Queue.cpp @@ -11,9 +11,10 @@ ACE_RCSID(ace, Timer_Queue, "$Id$") #include "ace/Timer_Hash.h" #include "ace/Timer_Queue_T.cpp" +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Timer_Queue_T< ACE_Event_Handler*, @@ -31,9 +32,14 @@ template class ACE_Event_Handler_Handle_Timeout_Upcall, ACE_Null_Mutex>, ACE_Null_Mutex>; + +ACE_END_VERSIONED_NAMESPACE_DECL + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Unbounded_Set *>; template class ACE_Node *>; diff --git a/ace/config-lite.h b/ace/config-lite.h index 9ff609a88e6..372229a35a9 100644 --- a/ace/config-lite.h +++ b/ace/config-lite.h @@ -676,8 +676,11 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \ # define ACE_STD_NAMESPACE #endif -// empty ACE_OS namespace to help identify compiler errors more easily. +// empty ACE_OS namespace to help identify compiler errors more +// easily. +ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS {} +ACE_END_VERSIONED_NAMESPACE_DECL #if !defined (ACE_OS_String) # define ACE_OS_String ACE_OS #endif /* ACE_OS_String */ diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features index b882af40920..0de66665428 100644 --- a/bin/MakeProjectCreator/config/global.features +++ b/bin/MakeProjectCreator/config/global.features @@ -40,7 +40,8 @@ boost = 0 wince = 0 uses_wchar = 0 ziparchive = 0 -negotiate_codesets = 0 +negotiate_codesets = 0 +versioned_namespace = 0 vcl = 0 // Features for various GUI libraries diff --git a/bin/fuzz.pl b/bin/fuzz.pl index b05f09d9fd6..6eb9163e125 100755 --- a/bin/fuzz.pl +++ b/bin/fuzz.pl @@ -708,7 +708,7 @@ sub check_for_push_and_pop () close (FILE); if ($disable == 0 && $push_count != $pop_count) { - print_error ("$file:$.: #pragma warning(push)/(pop) mismatch"); + print_error ("$file: #pragma warning(push)/(pop) mismatch"); } } else { @@ -717,6 +717,43 @@ sub check_for_push_and_pop () } } +# This test verifies that the same number of +# "ACE_VERSIONED_NAMESPACE_BEGIN_DECL" and +# "ACE_END_VERSIONED_NAMESPACE_DECL" macros are used in a given +# source file. +sub check_for_versioned_namespace_begin_end () +{ + print "Running versioned namespace begin/end test\n"; + foreach $file (@files_cpp, @files_inl, @files_h) { + my $begin_count = 0; + my $end_count = 0; + if (open (FILE, $file)) { + print "Looking at file $file\n" if $opt_d; + while () { + if (/^\s*\w+_BEGIN_VERSIONED_NAMESPACE_DECL/) { + ++$begin_count; + } + if (/^\s*\w+_END_VERSIONED_NAMESPACE_DECL/) { + ++$end_count; + } + if ($begin_count > $end_count and /^\s*#\s*include\s*/) { + print_error ("$file:$.: #include directive within Versioned namespace block"); + } + } + + close (FILE); + + if ($begin_count != $end_count) { + print_error ("$file: Versioned namespace begin($begin_count)/end($end_count) mismatch"); + } + } + else { + print STDERR "Error: Could not open $file\n"; + } + } +} + + # Check doxygen @file comments sub check_for_mismatched_filename () { @@ -1311,6 +1348,7 @@ if (!getopts ('cdhl:t:mv') || $opt_h) { check_for_tchar check_for_pre_and_post check_for_push_and_pop + check_for_versioned_namespace_begin_end check_for_mismatched_filename check_for_bad_run_test check_for_absolute_ace_wrappers @@ -1369,6 +1407,7 @@ check_for_preprocessor_comments () if ($opt_l >= 7); check_for_tchar () if ($opt_l >= 4); check_for_pre_and_post () if ($opt_l >= 4); check_for_push_and_pop () if ($opt_l >= 4); +check_for_versioned_namespace_begin_end () if ($opt_l >= 4); check_for_mismatched_filename () if ($opt_l >= 2); check_for_bad_run_test () if ($opt_l >= 6); check_for_absolute_ace_wrappers () if ($opt_l >= 3); @@ -1381,6 +1420,7 @@ check_for_include () if ($opt_l >= 5); check_for_non_bool_operators () if ($opt_l > 2); check_for_long_file_names () if ($opt_l > 1 ); + print "\nFuzz.pl - $errors error(s), $warnings warning(s)\n"; exit (1) if $errors > 0; -- cgit v1.2.1