diff options
| -rw-r--r-- | ACE/ChangeLog | 15 | ||||
| -rw-r--r-- | ACE/ace/IPC_SAP.cpp | 8 | ||||
| -rw-r--r-- | ACE/ace/Select_Reactor_Base.h | 4 | ||||
| -rw-r--r-- | ACE/ace/Thread_Exit.cpp | 10 | ||||
| -rw-r--r-- | ACE/ace/Thread_Exit.h | 2 | ||||
| -rw-r--r-- | ACE/ace/config-linux-common.h | 3 | ||||
| -rw-r--r-- | ACE/ace/config-openbsd.h | 6 |
7 files changed, 26 insertions, 22 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index c6ddbb7c22f..a42cb56b43a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,18 @@ +Thu Oct 18 10:08:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Thread_Exit.{h,cpp}: + Changed is_constructed_ flag to a real bool + + * ace/IPC_SAP.cpp: + Updated some defines in comments + + * ace/config-openbsd.h: + * ace/config-linux-common.h: + Removed some commented out defines + + * ace/Select_Reactor_Base.h: + Layout changes + Wed Oct 17 16:03:19 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * bin/msvc_static_order.lst: diff --git a/ACE/ace/IPC_SAP.cpp b/ACE/ace/IPC_SAP.cpp index 2b2f6625348..b9ef15c6002 100644 --- a/ACE/ace/IPC_SAP.cpp +++ b/ACE/ace/IPC_SAP.cpp @@ -67,7 +67,7 @@ ACE_IPC_SAP::enable (int value) const default: ACE_NOTSUP_RETURN (-1); } -#else /* ! ACE_WIN32 && ! VXWORKS */ +#else /* ! ACE_WIN32 && ! ACE_VXWORKS */ switch (value) { #if defined (SIGURG) @@ -114,7 +114,7 @@ ACE_IPC_SAP::enable (int value) const return -1; } return 0; -#endif /* ! ACE_WIN32 && ! VXWORKS */ +#endif /* ! ACE_WIN32 && ! ACE_VXWORKS */ /* NOTREACHED */ } @@ -139,7 +139,7 @@ ACE_IPC_SAP::disable (int value) const default: ACE_NOTSUP_RETURN (-1); } -#else /* ! ACE_WIN32 && ! VXWORKS */ +#else /* ! ACE_WIN32 && ! ACE_VXWORKS */ switch (value) { #if defined (SIGURG) @@ -186,7 +186,7 @@ ACE_IPC_SAP::disable (int value) const return -1; } return 0; -#endif /* ! ACE_WIN32 && ! VXWORKS */ +#endif /* ! ACE_WIN32 && ! ACE_VXWORKS */ /* NOTREACHED */ } diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h index bb12154ca8c..7d001e1a8ec 100644 --- a/ACE/ace/Select_Reactor_Base.h +++ b/ACE/ace/Select_Reactor_Base.h @@ -97,8 +97,7 @@ public: ACE_Event_Tuple (void); /// Constructor. - ACE_Event_Tuple (ACE_Event_Handler *eh, - ACE_HANDLE h); + ACE_Event_Tuple (ACE_Event_Handler *eh, ACE_HANDLE h); /// Equality operator. bool operator== (const ACE_Event_Tuple &rhs) const; @@ -590,7 +589,6 @@ protected: int supress_notify_renew (void); void supress_notify_renew (int sr); - private: /// Determine whether we should renew Select_Reactor's token after handling diff --git a/ACE/ace/Thread_Exit.cpp b/ACE/ace/Thread_Exit.cpp index 380dee69203..48f6b5dff47 100644 --- a/ACE/ace/Thread_Exit.cpp +++ b/ACE/ace/Thread_Exit.cpp @@ -9,7 +9,7 @@ ACE_RCSID(ace, Thread_Exit, "$Id$") ACE_BEGIN_VERSIONED_NAMESPACE_DECL -u_int ACE_Thread_Exit::is_constructed_ = 0; +bool ACE_Thread_Exit::is_constructed_ = false; void ACE_Thread_Exit::cleanup (void *instance) @@ -22,7 +22,7 @@ ACE_Thread_Exit::cleanup (void *instance) // ACE::fini() is enabled here. ACE_Thread_Manager::thr_exit_ = 0; - ACE_Thread_Exit::is_constructed_ = 0; + ACE_Thread_Exit::is_constructed_ = false; // All TSS objects have been destroyed. Reset this flag so // ACE_Thread_Exit singleton can be created again. } @@ -42,20 +42,20 @@ ACE_Thread_Exit::instance (void) // Implement the Double Check pattern. - if (ACE_Thread_Exit::is_constructed_ == 0) + if (!ACE_Thread_Exit::is_constructed_) { ACE_MT (ACE_Thread_Mutex *lock = ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_THREAD_EXIT_LOCK); ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, 0)); - if (ACE_Thread_Exit::is_constructed_ == 0) + if (!ACE_Thread_Exit::is_constructed_) { ACE_NEW_RETURN (instance_, ACE_TSS_TYPE (ACE_Thread_Exit), 0); - ACE_Thread_Exit::is_constructed_ = 1; + ACE_Thread_Exit::is_constructed_ = true; ACE_Thread_Manager::set_thr_exit (instance_); } diff --git a/ACE/ace/Thread_Exit.h b/ACE/ace/Thread_Exit.h index 77f1b8e3c1d..e37776bb455 100644 --- a/ACE/ace/Thread_Exit.h +++ b/ACE/ace/Thread_Exit.h @@ -71,7 +71,7 @@ private: * See bug #526. * We don't follow the singleton pattern due to dependency issues. */ - static unsigned int is_constructed_; + static bool is_constructed_; }; /** diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 7f94267ece6..76d61201ba0 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -318,11 +318,8 @@ // Although the scandir man page says otherwise, this setting is correct. #define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR -//#define ACE_LACKS_STRRECVFD #define ACE_HAS_STRBUF_T -//#define ACE_LACKS_MSYNC - // A conflict appears when including both <ucontext.h> and // <sys/procfs.h> with recent glibc headers. //#define ACE_HAS_PROC_FS diff --git a/ACE/ace/config-openbsd.h b/ACE/ace/config-openbsd.h index 4d8d79a994b..010bc780ea2 100644 --- a/ACE/ace/config-openbsd.h +++ b/ACE/ace/config-openbsd.h @@ -154,10 +154,6 @@ // Compiler/platform defines the sig_atomic_t typedef. #define ACE_HAS_SIG_ATOMIC_T -// Compiler/platform supports sys_siglist array. -// *** This refers to (_sys_siglist) instead of (sys_siglist) -// #define ACE_HAS_SYS_SIGLIST - // Compiler/platform defines a union semun for SysV shared memory. #define ACE_HAS_SEMUN @@ -181,8 +177,6 @@ // Platform/compiler supports timezone * as second parameter to gettimeofday(). #define ACE_HAS_TIMEZONE_GETTIMEOFDAY -//#define ACE_HAS_SIG_C_FUNC - // OpenBSD's dlsym call segfaults when passed an invalid handle. // It seems as if most other OSs detect this and just report an // error. |