ChangeLogTag:Mon Feb 14 18:24:19 2005 Steve Huston <shuston@riverace.com>

13 files changed, 71 insertions, 52 deletions

diff --git a/ChangeLog b/ChangeLog
index f9e98abf97c..3687f26adad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Mon Feb 14 18:24:19 2005  Steve Huston  <shuston@riverace.com>
+
+	* ace/OS_TLI.inl: Added "namespace ACE_OS" around all the methods,
+	  instead of prepending ACE_OS to the names. This continues some
+	  similar changes, such as to OS_NS_signal.inl.
+
+	* apps/JAWS3/jaws3/Asynch_IO.h:
+	* apps/JAWS3/jaws3/Asynch_IO_Helpers.h:
+	* apps/JAWS3/jaws3/Concurrency_T.h:
+	* apps/JAWS3/jaws3/Event_Dispatcher.h:
+	* apps/JAWS3/jaws3/Options.h:
+	* apps/JAWS3/jaws3/Reactive_IO.h:
+	* apps/JAWS3/jaws3/Reactive_IO_Helpers.h:
+	* apps/JAWS3/jaws3/Signal_Task.h:
+	* apps/JAWS3/jaws3/Synch_IO.h:
+	  Removed #include "ace/OS.h", replacing with other #includes
+	  as needed. If OS.h is included, some other OS_*.h files can get
+	  pulled in and sometimes ends up tentatively defining structs in
+	  ACE_OS's namespace. This can end up tripping HP-UX aCC. Not sure
+	  why it's only aCC and not other compilers as well, but there it is.
+	  Finally resolves some nagging compile errors on HP-UX.
+
 Mon Feb 14 17:36:43 2005  Steve Huston  <shuston@riverace.com>
 
 	* ace/ace.mwc: Removed RMCast and TMCast, since they're now under
diff --git a/ace/OS_TLI.inl b/ace/OS_TLI.inl
index 09595026dcd..d88655338fb 100644
--- a/ace/OS_TLI.inl
+++ b/ace/OS_TLI.inl
@@ -3,10 +3,10 @@
 
 #include "ace/OS_NS_errno.h"
 
+namespace ACE_OS {
+
 ACE_INLINE int
-ACE_OS::t_accept (ACE_HANDLE handle,
-                  ACE_HANDLE reshandle,
-                  struct t_call *call)
+t_accept (ACE_HANDLE handle, ACE_HANDLE reshandle, struct t_call *call)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_accept (handle, reshandle, call), int, -1);
@@ -20,8 +20,7 @@ ACE_OS::t_accept (ACE_HANDLE handle,
 }
 
 ACE_INLINE char *
-ACE_OS::t_alloc (ACE_HANDLE handle, int struct_type,
-                 int fields)
+t_alloc (ACE_HANDLE handle, int struct_type, int fields)
 {
 #if defined (ACE_HAS_TLI)
 #  if (_XOPEN_SOURCE - 0 >= 500)
@@ -44,8 +43,7 @@ ACE_OS::t_alloc (ACE_HANDLE handle, int struct_type,
 }
 
 ACE_INLINE int
-ACE_OS::t_bind (ACE_HANDLE handle, struct t_bind *req,
-                struct t_bind *ret)
+t_bind (ACE_HANDLE handle, struct t_bind *req, struct t_bind *ret)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_bind (handle, req, ret), int, -1);
@@ -59,7 +57,7 @@ ACE_OS::t_bind (ACE_HANDLE handle, struct t_bind *req,
 }
 
 ACE_INLINE int
-ACE_OS::t_close (ACE_HANDLE handle)
+t_close (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_close (handle), int, -1);
@@ -71,9 +69,9 @@ ACE_OS::t_close (ACE_HANDLE handle)
 }
 
 ACE_INLINE int
-ACE_OS::t_connect(ACE_HANDLE fildes,
-                  struct t_call *sndcall,
-                  struct t_call *rcvcall)
+t_connect(ACE_HANDLE fildes,
+          struct t_call *sndcall,
+          struct t_call *rcvcall)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_connect (fildes, sndcall, rcvcall), int, -1);
@@ -87,7 +85,7 @@ ACE_OS::t_connect(ACE_HANDLE fildes,
 }
 
 ACE_INLINE void
-ACE_OS::t_error (const char *errmsg)
+t_error (const char *errmsg)
 {
 #if defined (ACE_HAS_TLI)
 #if defined (ACE_HAS_BROKEN_T_ERROR)
@@ -101,7 +99,7 @@ ACE_OS::t_error (const char *errmsg)
 }
 
 ACE_INLINE int
-ACE_OS::t_free (char *ptr, int struct_type)
+t_free (char *ptr, int struct_type)
 {
 #if defined (ACE_HAS_TLI)
   if (ptr == 0)
@@ -116,7 +114,7 @@ ACE_OS::t_free (char *ptr, int struct_type)
 }
 
 ACE_INLINE int
-ACE_OS::t_getinfo (ACE_HANDLE handle, struct t_info *info)
+t_getinfo (ACE_HANDLE handle, struct t_info *info)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_getinfo (handle, info), int, -1);
@@ -129,9 +127,7 @@ ACE_OS::t_getinfo (ACE_HANDLE handle, struct t_info *info)
 }
 
 ACE_INLINE int
-ACE_OS::t_getname (ACE_HANDLE handle,
-                   struct netbuf *namep,
-                   int type)
+t_getname (ACE_HANDLE handle, struct netbuf *namep, int type)
 {
 #if defined (ACE_HAS_XTI)
   struct t_bind bound, peer;
@@ -181,7 +177,7 @@ ACE_OS::t_getname (ACE_HANDLE handle,
 }
 
 ACE_INLINE int
-ACE_OS::t_getstate (ACE_HANDLE handle)
+t_getstate (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_getstate (handle), int, -1);
@@ -193,7 +189,7 @@ ACE_OS::t_getstate (ACE_HANDLE handle)
 }
 
 ACE_INLINE int
-ACE_OS::t_listen (ACE_HANDLE handle, struct t_call *call)
+t_listen (ACE_HANDLE handle, struct t_call *call)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_listen (handle, call), int, -1);
@@ -206,7 +202,7 @@ ACE_OS::t_listen (ACE_HANDLE handle, struct t_call *call)
 }
 
 ACE_INLINE int
-ACE_OS::t_look (ACE_HANDLE handle)
+t_look (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_look (handle), int, -1);
@@ -218,7 +214,7 @@ ACE_OS::t_look (ACE_HANDLE handle)
 }
 
 ACE_INLINE ACE_HANDLE
-ACE_OS::t_open (char *path, int oflag, struct t_info *info)
+t_open (char *path, int oflag, struct t_info *info)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_open (path, oflag, info), ACE_HANDLE, ACE_INVALID_HANDLE);
@@ -232,9 +228,7 @@ ACE_OS::t_open (char *path, int oflag, struct t_info *info)
 }
 
 ACE_INLINE int
-ACE_OS::t_optmgmt (ACE_HANDLE handle,
-                   struct t_optmgmt *req,
-                   struct t_optmgmt *ret)
+t_optmgmt (ACE_HANDLE handle, struct t_optmgmt *req, struct t_optmgmt *ret)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_optmgmt (handle, req, ret), int, -1);
@@ -248,10 +242,10 @@ ACE_OS::t_optmgmt (ACE_HANDLE handle,
 }
 
 ACE_INLINE int
-ACE_OS::t_rcv (ACE_HANDLE handle,
-               char *buf,
-               unsigned int nbytes,
-               int *flags)
+t_rcv (ACE_HANDLE handle,
+       char *buf,
+       unsigned int nbytes,
+       int *flags)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcv (handle, buf, nbytes, flags),
@@ -267,7 +261,7 @@ ACE_OS::t_rcv (ACE_HANDLE handle,
 }
 
 ACE_INLINE int
-ACE_OS::t_rcvdis (ACE_HANDLE handle, struct t_discon *discon)
+t_rcvdis (ACE_HANDLE handle, struct t_discon *discon)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcvdis (handle, discon), int, -1);
@@ -280,7 +274,7 @@ ACE_OS::t_rcvdis (ACE_HANDLE handle, struct t_discon *discon)
 }
 
 ACE_INLINE int
-ACE_OS::t_rcvrel (ACE_HANDLE handle)
+t_rcvrel (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcvrel (handle), int, -1);
@@ -292,9 +286,9 @@ ACE_OS::t_rcvrel (ACE_HANDLE handle)
 }
 
 ACE_INLINE int
-ACE_OS::t_rcvudata (ACE_HANDLE handle,
-                    struct t_unitdata *unitdata,
-                    int *flags)
+t_rcvudata (ACE_HANDLE handle,
+            struct t_unitdata *unitdata,
+            int *flags)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcvudata (handle, unitdata, flags),
@@ -309,7 +303,7 @@ ACE_OS::t_rcvudata (ACE_HANDLE handle,
 }
 
 ACE_INLINE int
-ACE_OS::t_rcvuderr (ACE_HANDLE handle, struct t_uderr *uderr)
+t_rcvuderr (ACE_HANDLE handle, struct t_uderr *uderr)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcvuderr (handle, uderr), int, -1);
@@ -322,10 +316,10 @@ ACE_OS::t_rcvuderr (ACE_HANDLE handle, struct t_uderr *uderr)
 }
 
 ACE_INLINE int
-ACE_OS::t_snd (ACE_HANDLE handle,
-               const char *buf,
-               unsigned int nbytes,
-               int flags)
+t_snd (ACE_HANDLE handle,
+       const char *buf,
+       unsigned int nbytes,
+       int flags)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_snd (handle, (char *) buf, nbytes, flags), int, -1);
@@ -340,7 +334,7 @@ ACE_OS::t_snd (ACE_HANDLE handle,
 }
 
 ACE_INLINE int
-ACE_OS::t_snddis (ACE_HANDLE handle, struct t_call *call)
+t_snddis (ACE_HANDLE handle, struct t_call *call)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_snddis (handle, call), int, -1);
@@ -353,7 +347,7 @@ ACE_OS::t_snddis (ACE_HANDLE handle, struct t_call *call)
 }
 
 ACE_INLINE int
-ACE_OS::t_sndrel (ACE_HANDLE handle)
+t_sndrel (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_sndrel (handle), int, -1);
@@ -365,7 +359,7 @@ ACE_OS::t_sndrel (ACE_HANDLE handle)
 }
 
 ACE_INLINE int
-ACE_OS::t_sync (ACE_HANDLE handle)
+t_sync (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_sync (handle), int, -1);
@@ -377,7 +371,7 @@ ACE_OS::t_sync (ACE_HANDLE handle)
 }
 
 ACE_INLINE int
-ACE_OS::t_unbind (ACE_HANDLE handle)
+t_unbind (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_unbind (handle), int, -1);
@@ -387,3 +381,5 @@ ACE_OS::t_unbind (ACE_HANDLE handle)
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_TLI */
 }
+
+}  /* end namespace ACE_OS */
diff --git a/apps/JAWS3/jaws3/Asynch_IO.h b/apps/JAWS3/jaws3/Asynch_IO.h
index b62a0e4b285..68fd257cb24 100644
--- a/apps/JAWS3/jaws3/Asynch_IO.h
+++ b/apps/JAWS3/jaws3/Asynch_IO.h
@@ -4,9 +4,10 @@
 #ifndef JAWS_ASYNCH_IO_H
 #define JAWS_ASYNCH_IO_H
 
-#include "ace/OS.h"
 #include "ace/Asynch_IO.h"
+#include "ace/Message_Block.h"
 #include "ace/Singleton.h"
+#include "ace/Time_Value.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/IO.h"
diff --git a/apps/JAWS3/jaws3/Asynch_IO_Helpers.h b/apps/JAWS3/jaws3/Asynch_IO_Helpers.h
index 473b5cbc842..e82ab8189e5 100644
--- a/apps/JAWS3/jaws3/Asynch_IO_Helpers.h
+++ b/apps/JAWS3/jaws3/Asynch_IO_Helpers.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_ASYNCH_IO_HELPERS_H
 #define JAWS_ASYNCH_IO_HELPERS_H
 
-#include "ace/OS.h"
 #include "ace/Asynch_IO.h"
 #include "ace/Singleton.h"
 
diff --git a/apps/JAWS3/jaws3/Concurrency.cpp b/apps/JAWS3/jaws3/Concurrency.cpp
index 3844950c25d..3d42fde5fae 100644
--- a/apps/JAWS3/jaws3/Concurrency.cpp
+++ b/apps/JAWS3/jaws3/Concurrency.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/OS_NS_strings.h"
 #include "ace/Message_Block.h"
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
diff --git a/apps/JAWS3/jaws3/Concurrency_T.h b/apps/JAWS3/jaws3/Concurrency_T.h
index 788129d74cf..704da56faea 100644
--- a/apps/JAWS3/jaws3/Concurrency_T.h
+++ b/apps/JAWS3/jaws3/Concurrency_T.h
@@ -4,8 +4,8 @@
 #ifndef JAWS_CONCURRENCY_T_H
 #define JAWS_CONCURRENCY_T_H
 
-// This gets me the ACE #defines without having to #include "ace/OS.h".
-#include "ace/OS.h"
+// This gets me the ACE template defines without having to #include "ace/OS.h".
+#include "ace/config-lite.h"
 
 class JAWS_Protocol_Handler;
 
diff --git a/apps/JAWS3/jaws3/Event_Dispatcher.h b/apps/JAWS3/jaws3/Event_Dispatcher.h
index 65a82e56e03..d29095b5744 100644
--- a/apps/JAWS3/jaws3/Event_Dispatcher.h
+++ b/apps/JAWS3/jaws3/Event_Dispatcher.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_EVENT_DISPATCHER_H
 #define JAWS_EVENT_DISPATCHER_H
 
-#include "ace/OS.h"
 #include "ace/Reactor.h"
 #include "ace/Select_Reactor.h"
 
diff --git a/apps/JAWS3/jaws3/IO.cpp b/apps/JAWS3/jaws3/IO.cpp
index 6a4090f8481..98e2e6e32f5 100644
--- a/apps/JAWS3/jaws3/IO.cpp
+++ b/apps/JAWS3/jaws3/IO.cpp
@@ -4,6 +4,8 @@
 #define JAWS_BUILD_DLL
 #endif /*JAWS_BUILD_DLL*/
 
+#include "ace/OS_NS_strings.h"
+
 #include "jaws3/IO.h"
 #include "jaws3/Asynch_IO.h"
 #include "jaws3/Synch_IO.h"
diff --git a/apps/JAWS3/jaws3/Options.h b/apps/JAWS3/jaws3/Options.h
index b767cc5438c..ff3720706ad 100644
--- a/apps/JAWS3/jaws3/Options.h
+++ b/apps/JAWS3/jaws3/Options.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_OPTIONS_H
 #define JAWS_OPTIONS_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 #include "ace/Synch.h"
 
diff --git a/apps/JAWS3/jaws3/Reactive_IO.h b/apps/JAWS3/jaws3/Reactive_IO.h
index 9bbb8dbffdf..e899357e5fc 100644
--- a/apps/JAWS3/jaws3/Reactive_IO.h
+++ b/apps/JAWS3/jaws3/Reactive_IO.h
@@ -4,9 +4,10 @@
 #ifndef JAWS_REACTIVE_IO_H
 #define JAWS_REACTIVE_IO_H
 
-#include "ace/OS.h"
 #include "ace/Message_Block.h"
 #include "ace/Singleton.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Time_Value.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/IO.h"
diff --git a/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
index 966f99a0e55..9f94fd4caaf 100644
--- a/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
+++ b/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
@@ -4,9 +4,10 @@
 #ifndef JAWS_REACTIVE_IO_HELPERS_H
 #define JAWS_REACTIVE_IO_HELPERS_H
 
-#include "ace/OS.h"
+#include "ace/Event_Handler.h"
 #include "ace/Message_Block.h"
 #include "ace/Singleton.h"
+#include "ace/Time_Value.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/IO.h"
diff --git a/apps/JAWS3/jaws3/Signal_Task.h b/apps/JAWS3/jaws3/Signal_Task.h
index f66c9fb9e56..f1564b812a0 100644
--- a/apps/JAWS3/jaws3/Signal_Task.h
+++ b/apps/JAWS3/jaws3/Signal_Task.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_SIGNAL_TASK_H
 #define JAWS_SIGNAL_TASK_H
 
-#include "ace/OS.h"
 #include "ace/Synch.h"
 #include "ace/Signal.h"
 #include "ace/Singleton.h"
diff --git a/apps/JAWS3/jaws3/Synch_IO.h b/apps/JAWS3/jaws3/Synch_IO.h
index f74d78ce04d..5ecf5267088 100644
--- a/apps/JAWS3/jaws3/Synch_IO.h
+++ b/apps/JAWS3/jaws3/Synch_IO.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_SYNCH_IO_H
 #define JAWS_SYNCH_IO_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 
 #include "jaws3/IO.h"