ChangeLogTag:Mon Nov 3 03:04:48 UTC 2003 Don Hinton <dhinton@dresystems.com>

20 files changed, 65 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 60f3eeac075..f84addee407 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Mon Nov  3 03:04:48 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * ace/Barrier.h:
+        * ace/Managed_Object.h:
+        * ace/Object_Manager.h:
+        * tests/Priority_Reactor_Test.cpp:
+          Added #included needed when not inlining due to recent
+          subsetting.
+
+        * ace/OS_NS_Thread.inl:
+          Added #ifdef ACE_MT_SAFE around ACE_OS_Thread_Mutex_Guard
+          implementation.
+
+        * ace/Object_Manager_Base.h:
+          Removed ACE_OS friend statements and redundant method
+          declarations (which were problematic on Windows).
+
+        * ace/Token.cpp:
+          Moved #include of Token.i outside of ACE_HAS_THREADS #ifdef
+          since ACE_Noop_Token is there and required in single threaded
+          builds.
+
 Sun Nov  2 15:58:23 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * ace/ace.mpc:
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2d941f85125..8e9ba293546 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Mon Nov  3 03:04:48 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp:
+        * tao/IIOP_Acceptor.cpp:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/IIOP_Endpoint.cpp:
+        * tao/Strategies/DIOP_Acceptor.cpp:
+        * tao/Strategies/DIOP_Endpoint.cpp:
+        * tao/Strategies/DIOP_Profile.cpp:
+        * tao/Strategies/SHMIOP_Acceptor.cpp:
+        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+        * tao/Strategies/SHMIOP_Endpoint.cpp:
+        * tao/Strategies/SHMIOP_Profile.cpp:
+          Added #includes needed due to recent subsetting.
+
 Sun Nov  2 23:28:26 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * docs/tutorials/Quoter/Event_Service/server.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
index 3e9beefccbf..23fc7dcc895 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
@@ -8,6 +8,7 @@
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
+#include "ace/OS_Memory.h"
 
 ACE_RCSID (tao, 
            UIPMC_Endpoint, 
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index e7f52d99413..02766f36109 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -13,6 +13,8 @@
 #include "tao/IIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/os_include/os_netdb.h"
+
 ACE_RCSID(tao,
           IIOP_Acceptor,
           "$Id$")
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 6e85b2ab323..1e982241bf0 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -14,6 +14,7 @@
 #endif /* ! __ACE_INLINE__ */
 
 #include "ace/os_include/netinet/os_tcp.h"
+#include "ace/os_include/os_netdb.h"
 
 ACE_RCSID (tao,
            IIOP_Connection_Handler,
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index 2d21999d7f0..2b0294deccd 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -14,6 +14,7 @@ ACE_RCSID (tao,
 #endif /* __ACE_INLINE__ */
 
 #include "ace/OS_NS_stdio.h"
+#include "ace/os_include/os_netdb.h"
 
 TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 06be504d062..bdca8d2d02e 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -18,6 +18,8 @@
 #include "DIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/os_include/os_netdb.h"
+
 ACE_RCSID (tao,
            DIOP_Acceptor,
            "$Id$")
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
index b8086167e3c..ea2dbf9c96c 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -19,6 +19,8 @@ ACE_RCSID (tao,
 # include "DIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/os_include/os_netdb.h"
+
 TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
 
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index b2ed6e78d27..ae98edfdffd 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -11,6 +11,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "tao/IIOP_EndpointsC.h"
+#include "ace/os_include/os_netdb.h"
 
 ACE_RCSID (DIOP,
            DIOP_Profile,
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 8b71f089187..da2edda4bbf 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -16,6 +16,8 @@
 #include "SHMIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/os_include/os_netdb.h"
+
 ACE_RCSID (Strategies,
            SHMIOP_Acceptor,
            "$Id$")
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index d4cefc4518e..7ea7bdf42dd 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -21,6 +21,7 @@
 #endif /* ! __ACE_INLINE__ */
 
 #include "ace/os_include/netinet/os_tcp.h"
+#include "ace/os_include/os_netdb.h"
 
 ACE_RCSID(Strategies, SHMIOP_Connection_Handler, "$Id$")
 
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
index cc6169f64d2..28220de847c 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
@@ -18,6 +18,8 @@ ACE_RCSID (Strategies,
 # include "SHMIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/os_include/os_netdb.h"
+
 TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const ACE_MEM_Addr &addr,
                                           int use_dotted_decimal_addresses)
   : TAO_Endpoint (TAO_TAG_SHMEM_PROFILE)
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 7b312b82bbe..4c0a462bc68 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -20,6 +20,8 @@ ACE_RCSID (Strategies,
 # include "SHMIOP_Profile.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/os_include/os_netdb.h"
+
 static const char prefix_[] = "shmiop";
 
 const char TAO_SHMIOP_Profile::object_key_delimiter_ = '/';
diff --git a/ace/Barrier.h b/ace/Barrier.h
index 56d163caad9..86a3c2465ef 100644
--- a/ace/Barrier.h
+++ b/ace/Barrier.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/OS_NS_errno.h"
+
 // ACE platform supports some form of threading.
 #if !defined (ACE_HAS_THREADS)
 /**
diff --git a/ace/Managed_Object.h b/ace/Managed_Object.h
index 056f460efb9..4951d7e9381 100644
--- a/ace/Managed_Object.h
+++ b/ace/Managed_Object.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Object_Manager.h"
+#include "ace/Global_Macros.h"
 
 /**
  * @class ACE_Cleanup_Adapter
diff --git a/ace/OS_NS_Thread.inl b/ace/OS_NS_Thread.inl
index 73bb51eeeaf..b7359db8e63 100644
--- a/ace/OS_NS_Thread.inl
+++ b/ace/OS_NS_Thread.inl
@@ -4518,6 +4518,8 @@ ACE_OS::thread_mutex_unlock (ACE_thread_mutex_t *m)
 //#   define ACE_SPECIAL_INLINE inline
 # endif
 
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+
 ACE_INLINE
 int
 ACE_OS_Thread_Mutex_Guard::acquire (void)
@@ -4587,3 +4589,4 @@ ACE_OS_Recursive_Thread_Mutex_Guard::~ACE_OS_Recursive_Thread_Mutex_Guard ()
 {
   release ();
 }
+#endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 0e3b75aade7..cf880542528 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -18,6 +18,7 @@
 
 #include "ace/ACE_export.h"
 #include "ace/Object_Manager_Base.h"
+#include "ace/Global_Macros.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Object_Manager_Base.h b/ace/Object_Manager_Base.h
index 6c4ff9eb83a..d448347dcc0 100644
--- a/ace/Object_Manager_Base.h
+++ b/ace/Object_Manager_Base.h
@@ -28,27 +28,12 @@
 #include "ace/Cleanup.h"
 #include "ace/os_include/sys/os_types.h"
 #include "ace/os_include/os_signal.h"
-//#include "ace/OS_NS_netdb.h"
-//#include "ace/OS_NS_unistd.h"
-//#include "ace/OS_NS_time.h"
-//#include "ace/OS_NS_stdlib.h"
-namespace ACE_OS {
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
-int netdb_acquire (void);
-int netdb_release (void);
-# endif /* defined (ACE_MT_SAFE) && ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */
-ssize_t pread(ACE_HANDLE, void*, size_t, off_t);
-ssize_t pwrite(ACE_HANDLE, const void*, size_t, off_t);
-time_t mktime(tm*);
-int atexit(void (*)());
-}
+
 class ACE_Object_Manager;
 class ACE_OS_Object_Manager_Manager;
 class ACE_TSS_Cleanup;
 class ACE_TSS_Emulation;
 class ACE_Log_Msg;
-//void ACE_OS_Object_Manager_Internal_Exit_Hook ();
-
 class ACE_Thread_Hook;
 
 /**
@@ -255,14 +240,6 @@ public:
   static void print_error_message (u_int line_number, const ACE_TCHAR *message);
 
   /// This class is for internal use by ACE_OS, etc., only.
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
-  friend int ACE_OS::netdb_acquire (void);
-  friend int ACE_OS::netdb_release (void);
-# endif /* defined (ACE_MT_SAFE) && ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */
-  friend ssize_t ACE_OS::pread(ACE_HANDLE, void*, size_t, off_t);
-  friend ssize_t ACE_OS::pwrite(ACE_HANDLE, const void*, size_t, off_t);
-  friend time_t ACE_OS::mktime(tm*);
-  friend int ACE_OS::atexit(void (*)());
   friend class ACE_Object_Manager;
   friend class ACE_OS_Object_Manager_Manager;
   friend class ACE_TSS_Cleanup;
diff --git a/ace/Token.cpp b/ace/Token.cpp
index 72c636be112..78e44751b40 100644
--- a/ace/Token.cpp
+++ b/ace/Token.cpp
@@ -10,12 +10,12 @@
 
 ACE_RCSID(ace, Token, "$Id$")
 
-#if defined (ACE_HAS_THREADS)
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Token.i"
 #endif /* __ACE_INLINE__ */
 
+#if defined (ACE_HAS_THREADS)
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Token)
 
 
diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp
index 9d47b5f1a60..dabaa590d7f 100644
--- a/tests/Priority_Reactor_Test.cpp
+++ b/tests/Priority_Reactor_Test.cpp
@@ -34,6 +34,7 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Priority_Reactor.h"
 #include "Priority_Reactor_Test.h"
+#include "ace/OS_NS_sys_wait.h"
 
 ACE_RCSID(tests, Priority_Reactor_Test, "$Id$")