diff options
author | Steve Huston <shuston@riverace.com> | 2003-05-26 22:27:05 +0000 |
---|---|---|
committer | Steve Huston <shuston@riverace.com> | 2003-05-26 22:27:05 +0000 |
commit | 9db156edcb024881de15db96cfc44565c10fbdac (patch) | |
tree | a79da88b8713cfbdb90c22dec1b88ab9057afdef | |
parent | 7a12d4e01add967e271fdb67b27765c8a4661b49 (diff) | |
download | ATCD-9db156edcb024881de15db96cfc44565c10fbdac.tar.gz |
ChangeLogTag:Mon May 26 18:23:41 2003 Steve Huston <shuston@riverace.com>
-rw-r--r-- | ChangeLog | 25 | ||||
-rw-r--r-- | ace/MEM_Acceptor.cpp | 2 | ||||
-rw-r--r-- | ace/OS.h | 14 | ||||
-rw-r--r-- | ace/OS_TLI.h | 2 | ||||
-rw-r--r-- | ace/config-hpux-11.00.h | 2 | ||||
-rw-r--r-- | include/makeinclude/platform_hpux_aCC.GNU | 2 |
6 files changed, 35 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 499c5f48204..11a67e66b27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +Mon May 26 18:23:41 2003 Steve Huston <shuston@riverace.com> + + * ace/MEM_Acceptor.cpp (accept): Replace a C-style cast with + ACE_reinterpret_cast to silence a warning from HP aC++. + + * ace/config-hpux-11.00.h: Removed define for + ACE_HAS_TIUSER_H_BROKEN_EXTERN_C - it's not broken anymore in + 11.00 relatively recent updates. + + * ace/OS.h: Changed some u_int and u_long to unsigned int and + unsigned long, respectively to compile correctly even if + system includes are done out of order. + + * ace/OS_TLI.h: Fixed comment on #else of #if !defined (ACE_HAS_TLI). + + * include/makeinclude/platform_hpux_aCC.GNU: Add -D_HPUX_SOURCE to + CCFLAGS. ACE uses things that are set up by using this macro, but + if system includes are done before ace/config.h, it isn't picked + up in time. Fixes compile errors in performance-tests/SCTP which + were triggered by including system headers before ACE headers. + Although the general rule is to not do that, it's overly + restrictive in practice and we should try to remove that + restriction when it comes up. + (g++ sets this macro by default) + Mon May 26 12:03:33 2003 Steve Huston <shuston@riverace.com> * tests/tests.mpc: Added ACE_Init_Test. The WinXP-IA64 test was diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp index e9036cff07a..5a709478364 100644 --- a/ace/MEM_Acceptor.cpp +++ b/ace/MEM_Acceptor.cpp @@ -93,7 +93,7 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, if (remote_sap != 0) { - addr = (sockaddr *) &inet_addr; + addr = ACE_reinterpret_cast (sockaddr *, &inet_addr); len = sizeof (inet_addr); len_ptr = &len; } @@ -2274,7 +2274,7 @@ typedef int ACE_sema_t; typedef int ACE_rwlock_t; typedef int ACE_thread_t; typedef int ACE_hthread_t; -typedef u_int ACE_thread_key_t; +typedef unsigned int ACE_thread_key_t; // Ensure that ACE_THR_PRI_FIFO_DEF and ACE_THR_PRI_OTHER_DEF are // defined on non-threaded platforms, to support application source @@ -2550,7 +2550,7 @@ extern "C" int rand_r (ACE_RANDR_TYPE seed); // HP-UX 10.x's stdlib.h (long *) doesn't match that man page (u_int *) typedef long ACE_RANDR_TYPE; # else -typedef u_int ACE_RANDR_TYPE; +typedef unsigned int ACE_RANDR_TYPE; # endif /* HPUX_10 */ # endif /* ACE_HAS_BROKEN_RANDR */ @@ -3087,15 +3087,15 @@ protected: int is_signaled_; /// Number of waiting threads. - u_long waiting_threads_; + unsigned long waiting_threads_; }; struct ACE_OVERLAPPED { - u_long Internal; - u_long InternalHigh; - u_long Offset; - u_long OffsetHigh; + unsigned long Internal; + unsigned long InternalHigh; + unsigned long Offset; + unsigned long OffsetHigh; ACE_HANDLE hEvent; }; diff --git a/ace/OS_TLI.h b/ace/OS_TLI.h index 2e033e1aea6..7f3de6b11ed 100644 --- a/ace/OS_TLI.h +++ b/ace/OS_TLI.h @@ -35,7 +35,7 @@ struct t_unitdata { }; struct t_uderr { }; struct netbuf { }; -# else /* !ACE_WIN32 */ +# else /* !ACE_HAS_TLI */ # if !defined (ACE_HAS_TLI_PROTOTYPES) diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h index 32468e816ae..c38793e989b 100644 --- a/ace/config-hpux-11.00.h +++ b/ace/config-hpux-11.00.h @@ -378,8 +378,6 @@ //#define ACE_HAS_SVR4_TLI // Platform uses <xti.h>, not tiuser.h #define ACE_HAS_XTI -// But it has _terrno() outside the extern "C" stuff. -#define ACE_HAS_TIUSER_H_BROKEN_EXTERN_C // Platform provides ACE_TLI function prototypes. #define ACE_HAS_TLI_PROTOTYPES // HP-UX 11.00 (at least at initial releases) has some busted macro defs diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU index 16fbeaaf809..27b78640697 100644 --- a/include/makeinclude/platform_hpux_aCC.GNU +++ b/include/makeinclude/platform_hpux_aCC.GNU @@ -95,7 +95,7 @@ else endif # Suppress warning 302 ((...) parameter list is a non-portable feature) -CCFLAGS += $(THR_DEFS) -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE +W302 +CCFLAGS += $(THR_DEFS) -D_HPUX_SOURCE -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE +W302 # If exception support is explicitly disabled, tell the compiler. # This is not recommended since the run-time library can throw exceptions. |