ChangeLogTag:Fri Oct 31 17:47:18 UTC 2003 Don Hinton <dhinton@dresystems.com>dre_osh_namespace

17 files changed, 29 insertions, 1 deletions

diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index bab962c2917..7b183a03d62 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -34,6 +34,8 @@
 #include "CurrentC.i"
 #endif /* !defined INLINE */
 
+#include "ace/os_include/arpa/os_inet.h"
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 05d7928f7c3..39d08d5f656 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -46,6 +46,8 @@
 #include "DomainC.i"
 #endif /* !defined INLINE */
 
+#include "ace/os_include/arpa/os_inet.h"
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 0997581225f..10083d3af21 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -20,6 +20,8 @@
 # include "tao/Exception.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/OS_NS_stdio.h"
+
 ACE_RCSID (TAO,
            Exception,
            "$Id$")
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index fddbf332cce..86eae1a5d72 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -35,6 +35,8 @@
 #include "IIOPC.i"
 #endif /* !defined INLINE */
 
+#include "ace/os_include/arpa/os_inet.h"
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 07344f37a88..2e57f73f39c 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -18,6 +18,7 @@
 # include "tao/IIOP_Connection_Handler.i"
 #endif /* ! __ACE_INLINE__ */
 
+#include "ace/os_include/netinet/os_tcp.h"
 
 ACE_RCSID (tao,
            IIOP_Connection_Handler,
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index bdddb474641..5e5d07f2020 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -12,6 +12,7 @@ ACE_RCSID (tao,
 # include "tao/IIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/OS_NS_stdio.h"
 
 TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp
index 446fd512690..0b0f76ef786 100644
--- a/TAO/tao/ObjectIdListC.cpp
+++ b/TAO/tao/ObjectIdListC.cpp
@@ -34,6 +34,8 @@
 #include "ObjectIdListC.i"
 #endif /* !defined INLINE */
 
+#include "ace/os_include/arpa/os_inet.h"
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index a1bd099bd8f..a9285d8321d 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -43,6 +43,8 @@
 #include "Object_KeyC.i"
 #endif /* !defined INLINE */
 
+#include "ace/os_include/arpa/os_inet.h"
+
 // TAO_IDL - Generated from
 // be/be_visitor_sequence/sequence_cs.cpp:56
 
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 081fcab225f..c15e10f1ac1 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -43,6 +43,8 @@
 #include "PolicyC.i"
 #endif /* !defined INLINE */
 
+#include "ace/os_include/arpa/os_inet.h"
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index c864253d151..93c8715d48a 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -36,6 +36,8 @@
 #include "Policy_ForwardC.i"
 #endif /* !defined INLINE */
 
+#include "ace/os_include/arpa/os_inet.h"
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index 41461a32fe6..975107adbaa 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -39,6 +39,8 @@
 #include "TimeBaseC.i"
 #endif /* !defined INLINE */
 
+#include "ace/os_include/arpa/os_inet.h"
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 06a541acfbe..805076a7042 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -47,6 +47,8 @@
 #include "WrongTransactionC.i"
 #endif /* !defined INLINE */
 
+#include "ace/os_include/arpa/os_inet.h"
+
 // TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 230ff1b1a93..0b95fec5920 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -18,6 +18,7 @@
 # include "tao/default_client.i"
 #endif /* ! __ACE_INLINE__ */
 
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID (tao,
            default_client,
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index c8c3609ddb1..a16f09f5df1 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -6,6 +6,8 @@
 # include "tao/default_client.i"
 #endif /* ! __ACE_INLINE__ */
 
+#include "ace/OS_NS_strings.h"
+
 ACE_RCSID (tao,
            default_server,
            "$Id$")
diff --git a/TAO/tao/iiop_endpoints.cpp b/TAO/tao/iiop_endpoints.cpp
index 763d2df19df..72017202a0c 100644
--- a/TAO/tao/iiop_endpoints.cpp
+++ b/TAO/tao/iiop_endpoints.cpp
@@ -14,6 +14,8 @@
 #include "iiop_endpoints.i"
 #endif /* !defined INLINE */
 
+#include "ace/os_include/arpa/os_inet.h"
+
 static const CORBA::Long _oc_TAO_IIOP_Endpoint_Info[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
diff --git a/ace/OS.h b/ace/OS.h
index a240cae613d..86455725548 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if 0
+#if !defined (DO_NOT_INCLUDE_OS_H)
 #include "ace/Cleanup.h"
 #include "ace/Object_Manager_Base.h"
 #include "ace/OS_main.h"
diff --git a/ace/Unbounded_Set.h b/ace/Unbounded_Set.h
index 369dd849198..b185063c6af 100644
--- a/ace/Unbounded_Set.h
+++ b/ace/Unbounded_Set.h
@@ -15,6 +15,7 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/Node.h"
+#include "ace/os_include/os_stddef.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once