diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-31 02:52:15 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-31 02:52:15 +0000 |
| commit | 2dd7b4611d20c90fe777743d35e164cc7d660a10 (patch) | |
| tree | 3b86119b7829ce34a64814ea5f49167272fc20c2 | |
| parent | e84451686b3e13386d2775e5696a7f17fa60f9f2 (diff) | |
| download | ATCD-2dd7b4611d20c90fe777743d35e164cc7d660a10.tar.gz | |
ChangeLogTag:Fri Oct 31 03:00:20 UTC 2003 Don Hinton <dhinton@dresystems.com>
725 files changed, 1950 insertions, 1187 deletions
diff --git a/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACEXML/apps/svcconf/Svcconf_Handler.cpp index 5f335c42821..a37b8ed220f 100644 --- a/ACEXML/apps/svcconf/Svcconf_Handler.cpp +++ b/ACEXML/apps/svcconf/Svcconf_Handler.cpp @@ -52,7 +52,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *, const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) ACE_THROW_SPEC ((ACEXML_SAXException)) { - if (ACE_OS_String::strcmp (qName, ACE_TEXT ("dynamic")) == 0) + if (ACE_OS::strcmp (qName, ACE_TEXT ("dynamic")) == 0) { ACE_Parsed_Info *active_info = (this->in_stream_def_ == 0 ? &this->parsed_info_ : @@ -158,7 +158,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *, this->parsed_info_.reset (); } } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("static")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("static")) == 0) { if (this->in_stream_def_) { @@ -188,11 +188,11 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *, this->parsed_info_.reset (); } } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("module")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("module")) == 0) { this->in_module_ = 0; } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("streamdef")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("streamdef")) == 0) { // ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply stream %s of type %s\n"), // this->stream_info_.name (), @@ -204,7 +204,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *, this->stream_svc_type_ = 0; this->stream_ = 0; } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("stream")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("stream")) == 0) { // ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply stream %s of type %s\n"), // this->stream_info_.name (), @@ -267,20 +267,20 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *, ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) ACE_THROW_SPEC ((ACEXML_SAXException)) { - if (ACE_OS_String::strcmp (qName, ACE_TEXT ("dynamic")) == 0) + if (ACE_OS::strcmp (qName, ACE_TEXT ("dynamic")) == 0) { this->get_dynamic_attrs (alist ACEXML_ENV_ARG_PARAMETER); } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("initializer")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("initializer")) == 0) { this->get_initializer_attrs (alist ACEXML_ENV_ARG_PARAMETER); } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("static")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("static")) == 0) { this->get_static_attrs (alist ACEXML_ENV_ARG_PARAMETER); } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("stream")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("stream")) == 0) { this->get_stream_id (alist ACEXML_ENV_ARG_PARAMETER); @@ -299,17 +299,17 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *, // ACE_DEBUG ((LM_INFO, ACE_TEXT ("Retrieve stream %s from repository\n"), // this->stream_info_.name ())); } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("streamdef")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("streamdef")) == 0) { this->in_stream_def_ = 1; // @@ Set up stream service object } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("module")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("module")) == 0) { this->in_stream_def_ = 0; this->in_module_ = 1; } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("resume")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("resume")) == 0) { this->get_id (alist ACEXML_ENV_ARG_PARAMETER); if (this->in_module_) @@ -339,7 +339,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *, } this->parsed_info_.reset (); } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("suspend")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("suspend")) == 0) { this->get_id (alist ACEXML_ENV_ARG_PARAMETER); if (this->in_module_) @@ -369,7 +369,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *, } this->parsed_info_.reset (); } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("remove")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("remove")) == 0) { this->get_id (alist ACEXML_ENV_ARG_PARAMETER); if (this->in_module_) @@ -399,7 +399,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *, } this->parsed_info_.reset (); } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("ACE_Svc_Conf")) == 0) + else if (ACE_OS::strcmp (qName, ACE_TEXT ("ACE_Svc_Conf")) == 0) { // Main document tag. no-op. // ACE_DEBUG ((LM_INFO, ACE_TEXT ("ACE_Svc_Conf tag\n"))); @@ -493,7 +493,7 @@ ACEXML_Svcconf_Handler::get_stream_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_D if (alist != 0) for (size_t i = 0; i < alist->getLength (); ++i) { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) + if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) { this->stream_info_.name (alist->getValue (i)); } @@ -512,7 +512,7 @@ ACEXML_Svcconf_Handler::get_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) if (alist != 0) for (size_t i = 0; i < alist->getLength (); ++i) { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) + if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) { this->parsed_info_.name (alist->getValue (i)); } @@ -534,17 +534,17 @@ ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_A &this->stream_info_); for (size_t i = 0; i < alist->getLength (); ++i) { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) + if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) { info->name (alist->getValue (i)); } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("status")) == 0) + else if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("status")) == 0) { - if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("inactive")) == 0) + if (ACE_OS::strcmp (alist->getValue (i), ACE_TEXT ("inactive")) == 0) { info->active (0); } - else if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("active")) == 0) + else if (ACE_OS::strcmp (alist->getValue (i), ACE_TEXT ("active")) == 0) { info->active (1); } @@ -553,17 +553,17 @@ ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_A ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid attribute value, expecting 'active' or 'inactive'\n")), -1); } } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("type")) == 0) + else if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("type")) == 0) { - if (ACE_OS_String::strcasecmp (alist->getValue (i), ACE_TEXT ("service_object")) == 0) + if (ACE_OS::strcasecmp (alist->getValue (i), ACE_TEXT ("service_object")) == 0) { info->service_type (ACE_Service_Type::SERVICE_OBJECT); } - else if (ACE_OS_String::strcasecmp (alist->getValue (i), ACE_TEXT ("stream")) == 0) + else if (ACE_OS::strcasecmp (alist->getValue (i), ACE_TEXT ("stream")) == 0) { info->service_type (ACE_Service_Type::STREAM); } - else if (ACE_OS_String::strcasecmp (alist->getValue (i), ACE_TEXT ("module")) == 0) + else if (ACE_OS::strcasecmp (alist->getValue (i), ACE_TEXT ("module")) == 0) { info->service_type (ACE_Service_Type::MODULE); } @@ -591,15 +591,15 @@ ACEXML_Svcconf_Handler::get_initializer_attrs (ACEXML_Attributes *alist ACEXML_E &this->stream_info_); for (size_t i = 0; i < alist->getLength (); ++i) { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("init")) == 0) + if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("init")) == 0) { info->init_func (alist->getValue (i)); } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("path")) == 0) + else if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("path")) == 0) { info->path (alist->getValue (i)); } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0) + else if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0) { info->init_params (alist->getValue (i)); } @@ -622,11 +622,11 @@ ACEXML_Svcconf_Handler::get_static_attrs (ACEXML_Attributes *alist ACEXML_ENV_AR &this->stream_info_); for (size_t i = 0; i < alist->getLength (); ++i) { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) + if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) { info->name (alist->getValue (i)); } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0) + else if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0) { info->init_params (alist->getValue (i)); } diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp index cbee8018571..3a5694f120b 100644 --- a/ACEXML/common/FileCharStream.cpp +++ b/ACEXML/common/FileCharStream.cpp @@ -3,6 +3,8 @@ #include "ACEXML/common/FileCharStream.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_sys_stat.h" ACEXML_FileCharStream::ACEXML_FileCharStream (void) : filename_ (0), encoding_ (0), size_ (0), infile_ (0), peek_ (0) diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp index ba4ff11eccf..04fdf6bfdfc 100644 --- a/ACEXML/common/NamespaceSupport.cpp +++ b/ACEXML/common/NamespaceSupport.cpp @@ -2,6 +2,10 @@ #include "ACEXML/common/NamespaceSupport.h" +#if !defined (__ACEXML_INLINE__) +# include "ACEXML/common/NamespaceSupport.i" +#endif /* __ACEXML_INLINE__ */ + static const ACEXML_Char ACEXML_XMLNS_PREFIX_name[] = ACE_TEXT ("xmlns"); const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS_PREFIX = ACEXML_XMLNS_PREFIX_name; @@ -13,10 +17,6 @@ static const ACEXML_Char ACEXML_TABOO_NS_PREFIX[] = ACE_TEXT ("xml"); static const ACEXML_Char ACEXML_XMLNS_URI_name[] = ACE_TEXT ("http://www.w3.org/XML/1998/namespace"); const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS = ACEXML_XMLNS_URI_name; -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/common/NamespaceSupport.i" -#endif /* __ACEXML_INLINE__ */ - ACEXML_Namespace_Context_Stack::ACEXML_Namespace_Context_Stack (void) : head_ (0) { @@ -87,7 +87,7 @@ ACEXML_NamespaceSupport::declarePrefix (const ACEXML_Char *prefix, // Unless predefined by w3.org(?) NS prefix can never start with // "xml". - if (ACE_OS_String::strcmp (ACEXML_TABOO_NS_PREFIX, prefix) == 0) + if (ACE_OS::strcmp (ACEXML_TABOO_NS_PREFIX, prefix) == 0) return -1; ACEXML_String ns_prefix (prefix, 0, 0); @@ -220,7 +220,7 @@ ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName, const ACEXML_Char *&name, int is_attribute) const { - int qlen = ACE_static_cast (int, ACE_OS_String::strlen (qName)); + int qlen = ACE_static_cast (int, ACE_OS::strlen (qName)); int len = -1; for (int i = 0; i < qlen; ++i) if (qName [i] == ':') diff --git a/ACEXML/common/NamespaceSupport.h b/ACEXML/common/NamespaceSupport.h index 04177308b63..3b906c37c44 100644 --- a/ACEXML/common/NamespaceSupport.h +++ b/ACEXML/common/NamespaceSupport.h @@ -25,7 +25,8 @@ #include "ace/Functor.h" #include "ace/Hash_Map_Manager.h" #include "ace/Containers_T.h" -#include "ace/Synch.h" +#include "ace/Null_Mutex.h" + typedef ACE_Hash_Map_Entry<ACEXML_String, ACEXML_String> ACEXML_NS_CONTEXT_ENTRY; diff --git a/ACEXML/common/StrCharStream.cpp b/ACEXML/common/StrCharStream.cpp index db0c2c7761a..e37bbb4f6d8 100644 --- a/ACEXML/common/StrCharStream.cpp +++ b/ACEXML/common/StrCharStream.cpp @@ -25,7 +25,7 @@ ACEXML_StrCharStream::open (const ACEXML_Char *str, const ACEXML_Char* name) && (this->name_ = ACE::strnew (name)) != 0) { this->ptr_ = this->start_; - this->end_ = this->start_ + ACE_OS_String::strlen (this->start_); + this->end_ = this->start_ + ACE_OS::strlen (this->start_); return this->determine_encoding(); } return -1; // Invalid string passed. @@ -97,7 +97,7 @@ ACEXML_StrCharStream::read (ACEXML_Char *str, size_t len) { if (len * sizeof (ACEXML_Char) > (size_t) (this->end_ - this->ptr_)) len = this->end_ - this->ptr_; - ACE_OS_String::strncpy (str, this->ptr_, len); + ACE_OS::strncpy (str, this->ptr_, len); this->ptr_ += len; return ACE_static_cast (int, len); } diff --git a/ACEXML/common/URL_Addr.cpp b/ACEXML/common/URL_Addr.cpp index 3f06e15f7be..a1a9ea7aa40 100644 --- a/ACEXML/common/URL_Addr.cpp +++ b/ACEXML/common/URL_Addr.cpp @@ -1,16 +1,17 @@ // $Id$ -#include "ace/Log_Msg.h" -#include "ace/Auto_Ptr.h" #include "ACEXML/common/URL_Addr.h" - ACE_RCSID(common, ACEXML_URL_Addr, "$Id$") #if !defined (__ACEXML_INLINE__) #include "ACEXML/common/URL_Addr.inl" #endif /* __ACEXML_INLINE__ */ +#include "ace/Log_Msg.h" +#include "ace/Auto_Ptr.h" +#include "ace/OS_NS_stdio.h" + ACEXML_URL_Addr::ACEXML_URL_Addr (void) : path_name_ (0), addr_string_ (0), diff --git a/ACEXML/common/XML_Types.h b/ACEXML/common/XML_Types.h index 3cfb62efd99..7ed578366ff 100644 --- a/ACEXML/common/XML_Types.h +++ b/ACEXML/common/XML_Types.h @@ -17,7 +17,7 @@ #define _ACEXML_XML_TYPES_H_ #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp index 1b6cc2932fa..9a7b7930acd 100644 --- a/ACEXML/examples/SAXPrint/main.cpp +++ b/ACEXML/examples/SAXPrint/main.cpp @@ -10,6 +10,7 @@ #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" #include "ace/Log_Msg.h" +#include "ace/OS_main.h" static const ACEXML_Char *test_string = ACE_TEXT ("<?xml version='1.0'?> <ACE_Svc_Conf> <static id=\"ACE_Service_Manager\" params='-d -p 4911'/> <dynamic id=\"Test_Task\" type=\"service_object\"> A " <initializer path=\"CCM_App\" init='_make_Test_Task' params='-p 3000'/> </dynamic> </ACE_Svc_Conf>"); diff --git a/ACEXML/parser/parser/Entity_Manager.h b/ACEXML/parser/parser/Entity_Manager.h index e86f7747f03..5eec188a184 100644 --- a/ACEXML/parser/parser/Entity_Manager.h +++ b/ACEXML/parser/parser/Entity_Manager.h @@ -23,7 +23,7 @@ #include "ACEXML/common/XML_Types.h" #include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" +#include "ace/Null_Mutex.h" typedef ACE_Hash_Map_Entry<ACEXML_String, ACEXML_String> ACEXML_ENTITY_ENTRY; diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp index 65d4723b91a..213b4beaae8 100644 --- a/ACEXML/parser/parser/Parser.cpp +++ b/ACEXML/parser/parser/Parser.cpp @@ -1,16 +1,18 @@ // $Id$ +#include "ACEXML/parser/parser/Parser.h" + +#if !defined (__ACEXML_INLINE__) +# include "ACEXML/parser/parser/Parser.i" +#endif /* __ACEXML_INLINE__ */ + #include "ace/ACE.h" #include "ACEXML/common/Transcode.h" #include "ACEXML/common/AttributesImpl.h" #include "ACEXML/common/StrCharStream.h" #include "ACEXML/common/StreamFactory.h" -#include "ACEXML/parser/parser/Parser.h" #include "ACEXML/parser/parser/ParserInternals.h" - -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/parser/parser/Parser.i" -#endif /* __ACEXML_INLINE__ */ +#include "ace/OS_NS_strings.h" static const ACEXML_Char default_attribute_type[] = ACE_TEXT ("CDATA"); static const ACEXML_Char empty_string[] = { 0 }; diff --git a/ACEXML/tests/ContentHandler_Test.cpp b/ACEXML/tests/ContentHandler_Test.cpp index c1d9f765dfd..23eb3f96e23 100644 --- a/ACEXML/tests/ContentHandler_Test.cpp +++ b/ACEXML/tests/ContentHandler_Test.cpp @@ -12,6 +12,7 @@ #include "ACEXML/common/InputSource.h" #include "ACEXML/common/StrCharStream.h" #include "ACEXML/parser/parser/Parser.h" +#include "ace/OS_main.h" class Basic_Content_Tester : public ACEXML_DefaultHandler { diff --git a/ACEXML/tests/HttpCharStream_Test.cpp b/ACEXML/tests/HttpCharStream_Test.cpp index b30dc7fa55a..fd0bdc107c5 100644 --- a/ACEXML/tests/HttpCharStream_Test.cpp +++ b/ACEXML/tests/HttpCharStream_Test.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ACEXML/common/HttpCharStream.h" +#include "ace/OS_main.h" int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACEXML/tests/NamespaceSupport_Test.cpp b/ACEXML/tests/NamespaceSupport_Test.cpp index 418969d9c91..2632c6dc571 100644 --- a/ACEXML/tests/NamespaceSupport_Test.cpp +++ b/ACEXML/tests/NamespaceSupport_Test.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ACEXML/common/NamespaceSupport.h" +#include "ace/OS_main.h" int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACEXML/tests/Transcoder_Test.cpp b/ACEXML/tests/Transcoder_Test.cpp index 2e87a52a7e7..746d4442e89 100644 --- a/ACEXML/tests/Transcoder_Test.cpp +++ b/ACEXML/tests/Transcoder_Test.cpp @@ -2,6 +2,7 @@ #include "ACEXML/common/Transcode.h" #include "ace/Log_Msg.h" +#include "ace/OS_main.h" void dump_utf16 (const ACEXML_UTF16 *data, size_t len) diff --git a/ASNMP/asnmp/address.cpp b/ASNMP/asnmp/address.cpp index eea41707a15..72a910ddb07 100644 --- a/ASNMP/asnmp/address.cpp +++ b/ASNMP/asnmp/address.cpp @@ -37,6 +37,13 @@ =====================================================================*/ #include "asnmp/address.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_arpa_inet.h" +#include "ace/OS_NS_netdb.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_NS_stdio.h" +#include "ace/os_include/os_ctype.h" +#include "ace/OS_Memory.h" ACE_RCSID(asnmp, address, "$Id$") @@ -88,7 +95,7 @@ unsigned char& Address::operator[]( const int position) // overloaded equivlence operator, are two addresses equal? int operator==( const Address &lhs, const Address &rhs) { - if ( strcmp( (const char*) lhs, (const char*)rhs)==0) + if ( ACE_OS::strcmp( (const char*) lhs, (const char*)rhs)==0) return 1; else return 0; @@ -106,7 +113,7 @@ int operator!=( const Address &lhs, const Address &rhs) // overloaded > operator, is a1 > a2 int operator>( const Address &lhs, const Address &rhs) { - if ( strcmp( (const char*) lhs, (const char*)rhs)>0) + if (ACE_OS::strcmp( (const char*) lhs, (const char*)rhs)>0) return 1; else return 0; @@ -136,7 +143,7 @@ int operator<=( const Address &lhs,const Address &rhs) // overloaded < operator, is a1 < a2 int operator<( const Address &lhs, const Address &rhs) { - if ( strcmp( (const char*) lhs, (const char*)rhs)<0) + if (ACE_OS::strcmp( (const char*) lhs, (const char*)rhs)<0) return 1; else return 0; @@ -148,7 +155,7 @@ int operator==( const Address &lhs,const char *rhs) { if (!rhs && !lhs.valid()) return 1; - if (strcmp( (const char *) lhs, rhs)== 0) + if (ACE_OS::strcmp( (const char *) lhs, rhs)== 0) return 1; else return 0; @@ -167,7 +174,7 @@ int operator>( const Address &lhs,const char *rhs) { if (!rhs) return lhs.valid(); // if lhs valid then > 0, else invalid !> 0 - if (strcmp( (const char *) lhs, rhs)> 0) + if (ACE_OS::strcmp( (const char *) lhs, rhs)> 0) return 1; else return 0; @@ -179,7 +186,7 @@ int operator>=( const Address &lhs,const char *rhs) { if (!rhs) return 1; // always >= 0 - if (strcmp( (const char *) lhs, rhs)>= 0) + if (ACE_OS::strcmp( (const char *) lhs, rhs)>= 0) return 1; else return 0; @@ -191,7 +198,7 @@ int operator<( const Address &lhs,const char *rhs) { if (!rhs) return 0; // always >= 0 - if (strcmp( (const char *) lhs, rhs)< 0) + if (ACE_OS::strcmp( (const char *) lhs, rhs)< 0) return 1; else return 0; @@ -203,7 +210,7 @@ int operator<=( const Address &lhs,const char *rhs) { if (!rhs) return !lhs.valid(); // invalid == 0, else valid > 0 - if (strcmp( (const char *) lhs, rhs)<= 0) + if (ACE_OS::strcmp( (const char *) lhs, rhs)<= 0) return 1; else return 0; @@ -451,7 +458,7 @@ int IpAddress::parse_dotted_ipstring( const char *inaddr) return 0; // look for dot token separator - ip_token = strtok( (char *) temp,"."); + ip_token = ACE_OS::strtok( (char *) temp,"."); // while more tokens.. while ( ip_token != 0) { @@ -467,12 +474,12 @@ int IpAddress::parse_dotted_ipstring( const char *inaddr) if (( value > 0)&& ( value <=255)) address_buffer[token_count] = (unsigned char) value; else - if ( strcmp(ip_token,"0")==0) + if (ACE_OS::strcmp(ip_token,"0")==0) address_buffer[token_count]= (unsigned char) 0; else error_status = 1; token_count++; - ip_token = strtok( 0, "."); + ip_token = ACE_OS::strtok( 0, "."); } // gota be four in len diff --git a/ASNMP/asnmp/address.h b/ASNMP/asnmp/address.h index 21257d7737e..e6d89fedfd0 100644 --- a/ASNMP/asnmp/address.h +++ b/ASNMP/asnmp/address.h @@ -37,7 +37,8 @@ //----[ includes ]----------------------------------------------------- // ACE OS Adaption layer -#include "ace/OS.h" +#include "ace/os_include/netinet/os_in.h" +#include "ace/os_include/os_netdb.h" #include "ace/Log_Msg.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/ASNMP/asnmp/asn1.cpp b/ASNMP/asnmp/asn1.cpp index 77dc9baa5ec..ccb2e699456 100644 --- a/ASNMP/asnmp/asn1.cpp +++ b/ASNMP/asnmp/asn1.cpp @@ -52,6 +52,7 @@ #include "asnmp/asn1.h" #include "asnmp/snmp.h" +#include "ace/OS_NS_string.h" ACE_RCSID(asnmp, asn1, "$Id$") diff --git a/ASNMP/asnmp/asn1.h b/ASNMP/asnmp/asn1.h index c01b34e65a7..0c141c188d2 100644 --- a/ASNMP/asnmp/asn1.h +++ b/ASNMP/asnmp/asn1.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ASNMP/asnmp/ctr64.cpp b/ASNMP/asnmp/ctr64.cpp index 45d12cca277..e11b7cd613b 100644 --- a/ASNMP/asnmp/ctr64.cpp +++ b/ASNMP/asnmp/ctr64.cpp @@ -32,6 +32,7 @@ =====================================================================*/ #include "asnmp/ctr64.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(asnmp, ctr64, "$Id$") diff --git a/ASNMP/asnmp/integer.cpp b/ASNMP/asnmp/integer.cpp index ca399336053..d732e0f3ff9 100644 --- a/ASNMP/asnmp/integer.cpp +++ b/ASNMP/asnmp/integer.cpp @@ -33,11 +33,12 @@ =====================================================================*/ #include "asnmp/integer.h" // header file for gauge class +#include "ace/OS_NS_stdio.h" ACE_RCSID(asnmp, integer, "$Id$") // constructor with value -SnmpUInt32::SnmpUInt32 (const u_long i) +SnmpUInt32::SnmpUInt32 (const unsigned long i) { smival.value.uNumber=i; smival.syntax = sNMP_SYNTAX_UINT32; diff --git a/ASNMP/asnmp/octet.cpp b/ASNMP/asnmp/octet.cpp index b75a5186178..7c9db8ca405 100644 --- a/ASNMP/asnmp/octet.cpp +++ b/ASNMP/asnmp/octet.cpp @@ -33,8 +33,12 @@ derivatives based upon this software code base. =====================================================================*/ -#include "ace/OS.h" #include "asnmp/octet.h" // include definition for octet class +#include "ace/OS_Memory.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_ctype.h" +#include "ace/os_include/os_ctype.h" ACE_RCSID(asnmp, octet, "$Id$") @@ -477,7 +481,7 @@ const char * OctetStr::to_string() for ( unsigned long i=0; i < smival.value.string.len; i++) { if (( smival.value.string.ptr[i] != '\r')&& ( smival.value.string.ptr[i] != '\n')&& - (isprint((int) (smival.value.string.ptr[i]))==0)) + (ACE_OS::ace_isprint((int) (smival.value.string.ptr[i]))==0)) return(to_string_hex()); } @@ -587,7 +591,7 @@ const char *OctetStr::to_string_hex() #endif // _WIN32 ACE_OS::sprintf(line_ptr, fmt, char_buf); - line_ptr += 3 + strlen(char_buf); + line_ptr += 3 + ACE_OS::strlen(char_buf); } return output_buffer; diff --git a/ASNMP/asnmp/oid.cpp b/ASNMP/asnmp/oid.cpp index 03e65410a4a..71c5caa8835 100644 --- a/ASNMP/asnmp/oid.cpp +++ b/ASNMP/asnmp/oid.cpp @@ -36,6 +36,10 @@ //---------[ external C libaries used ]-------------------------------- #include "asnmp/oid.h" // include def for oid class +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_Memory.h" +#include "ace/os_include/os_ctype.h" ACE_RCSID(asnmp, oid, "$Id$") diff --git a/ASNMP/asnmp/oid.h b/ASNMP/asnmp/oid.h index c0de425a144..8ef171317f3 100644 --- a/ASNMP/asnmp/oid.h +++ b/ASNMP/asnmp/oid.h @@ -39,7 +39,7 @@ =====================================================================*/ //----------[ extern C libraries Needed ]--------------------------------- -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ASNMP/asnmp/pdu.cpp b/ASNMP/asnmp/pdu.cpp index 49c14861af6..ddd43a292ad 100644 --- a/ASNMP/asnmp/pdu.cpp +++ b/ASNMP/asnmp/pdu.cpp @@ -34,6 +34,8 @@ #include "asnmp/snmp.h" #include "asnmp/pdu.h" // include Pdu class definition +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(asnmp, pdu, "$Id$") diff --git a/ASNMP/asnmp/smi.h b/ASNMP/asnmp/smi.h index 09b3927b220..4fac7f8c1bc 100644 --- a/ASNMP/asnmp/smi.h +++ b/ASNMP/asnmp/smi.h @@ -35,7 +35,7 @@ =====================================================================*/ -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ASNMP/asnmp/snmp.cpp b/ASNMP/asnmp/snmp.cpp index 9c3b0d40af2..cc2e1dd4179 100644 --- a/ASNMP/asnmp/snmp.cpp +++ b/ASNMP/asnmp/snmp.cpp @@ -43,6 +43,9 @@ #include "asnmp/address.h" // class def for addresses #include "asnmp/wpdu.h" // adapter to cmu_library / wire protocol #include "asnmp/transaction.h" // synchronous transaction processor +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_time.h" ACE_RCSID(asnmp, snmp, "$Id$") diff --git a/ASNMP/asnmp/timetick.cpp b/ASNMP/asnmp/timetick.cpp index aeb8427c43e..e6b2d0d2231 100644 --- a/ASNMP/asnmp/timetick.cpp +++ b/ASNMP/asnmp/timetick.cpp @@ -32,6 +32,7 @@ =====================================================================*/ #include "asnmp/timetick.h" // include header file for timetick class +#include "ace/OS_NS_stdio.h" ACE_RCSID(asnmp, timetick, "$Id$") diff --git a/ASNMP/asnmp/transaction.cpp b/ASNMP/asnmp/transaction.cpp index 5eccd735879..e7c703aa865 100644 --- a/ASNMP/asnmp/transaction.cpp +++ b/ASNMP/asnmp/transaction.cpp @@ -18,6 +18,7 @@ #include "ace/Reactor.h" #include "asnmp/transaction.h" +#include "ace/OS_NS_string.h" ACE_RCSID(asnmp, transaction, "$Id$") diff --git a/ASNMP/asnmp/vb.cpp b/ASNMP/asnmp/vb.cpp index ab32e9639bb..ee80d7e68ec 100644 --- a/ASNMP/asnmp/vb.cpp +++ b/ASNMP/asnmp/vb.cpp @@ -39,6 +39,9 @@ #include "asnmp/oid.h" // include oid class defs #include "asnmp/vb.h" // include vb class defs #include "asnmp/snmperrs.h" // error codes +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_Memory.h" ACE_RCSID(asnmp, vb, "$Id$") @@ -385,7 +388,7 @@ int operator==( const Vb &lhs, const Vb &rhs) return 0; if (lhs.iv_vb_value_ != 0 && rhs.iv_vb_value_ != 0) { - int val = strcmp(lhs.iv_vb_value_->to_string(), + int val = ACE_OS::strcmp(lhs.iv_vb_value_->to_string(), rhs.iv_vb_value_->to_string()); return !val; } diff --git a/ASNMP/asnmp/vb.h b/ASNMP/asnmp/vb.h index f20b58cca2a..5a2b778748d 100644 --- a/ASNMP/asnmp/vb.h +++ b/ASNMP/asnmp/vb.h @@ -37,7 +37,7 @@ =====================================================================*/ //----[ external calls ]---------------------------------------------- -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ASNMP/asnmp/wpdu.cpp b/ASNMP/asnmp/wpdu.cpp index f4ac111fe0e..d05a750970f 100644 --- a/ASNMP/asnmp/wpdu.cpp +++ b/ASNMP/asnmp/wpdu.cpp @@ -19,6 +19,7 @@ #include "asnmp/wpdu.h" #include <ace/Log_Msg.h> +#include "ace/OS_NS_string.h" #define DEFINE_TRAP_CONSTANTS_ #include "asnmp/enttraps.h" diff --git a/ASNMP/asnmp/wpdu.h b/ASNMP/asnmp/wpdu.h index 4d56c73ada6..1485560baeb 100644 --- a/ASNMP/asnmp/wpdu.h +++ b/ASNMP/asnmp/wpdu.h @@ -20,7 +20,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ASNMP/tests/Counter64_Test.cpp b/ASNMP/tests/Counter64_Test.cpp index f60c3c3a64d..210fe3fc1d6 100644 --- a/ASNMP/tests/Counter64_Test.cpp +++ b/ASNMP/tests/Counter64_Test.cpp @@ -39,7 +39,6 @@ DAMAGES. -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ -#include "ace/OS.h" #include "asnmp/ctr64.h" #include "test_config.h" diff --git a/ASNMP/tests/Counter_Test.cpp b/ASNMP/tests/Counter_Test.cpp index 0538261cb8d..f85d0f47656 100644 --- a/ASNMP/tests/Counter_Test.cpp +++ b/ASNMP/tests/Counter_Test.cpp @@ -38,7 +38,6 @@ DAMAGES. -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ -#include "ace/OS.h" #include "asnmp/counter.h" #include "test_config.h" diff --git a/ASNMP/tests/Gauge_Test.cpp b/ASNMP/tests/Gauge_Test.cpp index a607d58c1b7..c4cbdfcbdf8 100644 --- a/ASNMP/tests/Gauge_Test.cpp +++ b/ASNMP/tests/Gauge_Test.cpp @@ -37,7 +37,6 @@ SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES. -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ -#include "ace/OS.h" #include "asnmp/gauge.h" #include "test_config.h" diff --git a/ASNMP/tests/Integer_Test.cpp b/ASNMP/tests/Integer_Test.cpp index c289425d8ea..e8b82352d92 100644 --- a/ASNMP/tests/Integer_Test.cpp +++ b/ASNMP/tests/Integer_Test.cpp @@ -39,7 +39,6 @@ DAMAGES. -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ -#include "ace/OS.h" #include "asnmp/integer.h" #include "test_config.h" diff --git a/ASNMP/tests/Octet_Test.cpp b/ASNMP/tests/Octet_Test.cpp index 45dd9bc10b6..09e03f32614 100644 --- a/ASNMP/tests/Octet_Test.cpp +++ b/ASNMP/tests/Octet_Test.cpp @@ -40,7 +40,6 @@ DAMAGES. -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ -#include "ace/OS.h" #include "asnmp/octet.h" #include "test_config.h" diff --git a/ASNMP/tests/Oid_Test.cpp b/ASNMP/tests/Oid_Test.cpp index c195b0a7105..9343dc2575e 100644 --- a/ASNMP/tests/Oid_Test.cpp +++ b/ASNMP/tests/Oid_Test.cpp @@ -38,7 +38,6 @@ SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES. -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ -#include "ace/OS.h" #include "asnmp/oid.h" #include "test_config.h" diff --git a/ASNMP/tests/Target_Test.cpp b/ASNMP/tests/Target_Test.cpp index 30f002b03ad..0e3548cf826 100644 --- a/ASNMP/tests/Target_Test.cpp +++ b/ASNMP/tests/Target_Test.cpp @@ -40,7 +40,6 @@ DAMAGES. -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ -#include "ace/OS.h" #include "asnmp/octet.h" #include "asnmp/target.h" #include "test_config.h" diff --git a/ASNMP/tests/Varbind_Test.cpp b/ASNMP/tests/Varbind_Test.cpp index 0491543f0e7..3340259341a 100644 --- a/ASNMP/tests/Varbind_Test.cpp +++ b/ASNMP/tests/Varbind_Test.cpp @@ -40,7 +40,6 @@ DAMAGES. -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ -#include "ace/OS.h" #include "asnmp/oid.h" #include "asnmp/vb.h" #include "test_config.h" diff --git a/ASNMP/tests/test_config.h b/ASNMP/tests/test_config.h index 42c4230453d..f94674ed504 100644 --- a/ASNMP/tests/test_config.h +++ b/ASNMP/tests/test_config.h @@ -16,6 +16,10 @@ #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_main.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_sys_stat.h" #include "ace/streams.h" diff --git a/ChangeLog b/ChangeLog index 059b75d0a6c..8ec6d323955 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Oct 31 03:00:20 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * header reductions. + Mon Oct 27 22:25:06 UTC 2003 Don Hinton <dhinton@dresystems.com> * ? diff --git a/Kokyu/Dispatcher_Task.cpp b/Kokyu/Dispatcher_Task.cpp index 8002d3a581d..e6d86711865 100644 --- a/Kokyu/Dispatcher_Task.cpp +++ b/Kokyu/Dispatcher_Task.cpp @@ -4,6 +4,7 @@ #include "ace/Malloc_T.h" #include "ace/Synch_T.h" +#include "ace/OS_NS_errno.h" #if ! defined (__ACE_INLINE__) #include "Dispatcher_Task.i" diff --git a/Kokyu/tests/DSRT_MIF/MIF.cpp b/Kokyu/tests/DSRT_MIF/MIF.cpp index 276271d3b62..18f96b54af4 100644 --- a/Kokyu/tests/DSRT_MIF/MIF.cpp +++ b/Kokyu/tests/DSRT_MIF/MIF.cpp @@ -6,6 +6,7 @@ #include "ace/Atomic_Op.h" #include "ace/Synch.h" #include "ace/High_Res_Timer.h" +#include "ace/Barrier.h" #include "Kokyu_dsrt.h" diff --git a/Kokyu/tests/EDF/test.cpp b/Kokyu/tests/EDF/test.cpp index 7844f4cbf4a..239b0e2dcbb 100644 --- a/Kokyu/tests/EDF/test.cpp +++ b/Kokyu/tests/EDF/test.cpp @@ -7,6 +7,7 @@ #include "ace/Sched_Params.h" #include "ace/SString.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_strings.h" ACE_CString sched_policy_str = "fifo"; diff --git a/Kokyu/tests/FIFO/test.cpp b/Kokyu/tests/FIFO/test.cpp index c61f14fdcfd..6669062ff33 100644 --- a/Kokyu/tests/FIFO/test.cpp +++ b/Kokyu/tests/FIFO/test.cpp @@ -6,6 +6,7 @@ #include "ace/Task.h" #include "ace/SString.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_strings.h" ACE_CString sched_policy_str = "fifo"; diff --git a/ace/ACE.cpp b/ace/ACE.cpp index f1c924305a4..26f9fc71029 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -1,6 +1,11 @@ // $Id$ #include "ace/ACE.h" + +#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#include "ace/ACE.i" +#endif /* ACE_LACKS_INLINE_FUNCTIONS */ + #include "ace/Basic_Types.h" #include "ace/Handle_Set.h" #include "ace/Auto_Ptr.h" @@ -8,10 +13,17 @@ #include "ace/Version.h" #include "ace/Message_Block.h" #include "ace/Log_Msg.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/ACE.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#include "ace/OS_NS_sys_select.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/OS_NS_signal.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_sys_resource.h" +#include "ace/OS_NS_sys_wait.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_sys_uio.h" +#include "ace/OS_NS_sys_stat.h" +#include "ace/OS_NS_ctype.h" ACE_RCSID(ace, ACE, "$Id$") diff --git a/ace/ACE.i b/ace/ACE.i index 189aa5d437d..7995f2e5a1f 100644 --- a/ace/ACE.i +++ b/ace/ACE.i @@ -1,6 +1,10 @@ /* -*- C++ -*- */ // $Id$ +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_Thread.h" +#include "ace/os_include/os_ctype.h" + // Wrappers for methods that have been moved to ACE_OS. ASYS_INLINE ssize_t diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp index 0a833c6040d..448fa0a753f 100644 --- a/ace/ARGV.cpp +++ b/ace/ARGV.cpp @@ -10,7 +10,9 @@ #endif /* __ACE_INLINE__ */ #include "ace/Log_Msg.h" -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_Memory.h" ACE_RCSID(ace, ARGV, "$Id$") diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp index ceb657608f2..d7d2a9dea3b 100644 --- a/ace/Acceptor.cpp +++ b/ace/Acceptor.cpp @@ -11,7 +11,7 @@ #include "ace/Handle_Set.h" #include "ace/Svc_Handler.h" #include "ace/WFMO_Reactor.h" - +#include "ace/OS_NS_sys_select.h" ACE_RCSID (ace, Acceptor, diff --git a/ace/Active_Map_Manager.h b/ace/Active_Map_Manager.h index 52108cada96..b91fd261932 100644 --- a/ace/Active_Map_Manager.h +++ b/ace/Active_Map_Manager.h @@ -15,12 +15,14 @@ #define ACE_ACTIVE_MAP_MANAGER_H #include /**/ "ace/pre.h" -#include "ace/OS_String.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Basic_Types.h" + /** * @class ACE_Active_Map_Manager_Key * diff --git a/ace/Active_Map_Manager.i b/ace/Active_Map_Manager.i index 0e73f7e50ec..05c29fd2069 100644 --- a/ace/Active_Map_Manager.i +++ b/ace/Active_Map_Manager.i @@ -2,6 +2,8 @@ // // $Id$ +#include "ace/OS_NS_string.h" + ACE_INLINE ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key (void) { @@ -74,16 +76,16 @@ ACE_INLINE void ACE_Active_Map_Manager_Key::decode (const void *data) { // Copy the information from the user buffer into the key. - ACE_OS_String::memcpy (&this->key_data_, - data, - sizeof this->key_data_); + ACE_OS::memcpy (&this->key_data_, + data, + sizeof this->key_data_); } ACE_INLINE void ACE_Active_Map_Manager_Key::encode (void *data) const { // Copy the key data to the user buffer. - ACE_OS_String::memcpy (data, - &this->key_data_, - sizeof this->key_data_); + ACE_OS::memcpy (data, + &this->key_data_, + sizeof this->key_data_); } diff --git a/ace/Addr.cpp b/ace/Addr.cpp index b87f440caed..0c31a45170b 100644 --- a/ace/Addr.cpp +++ b/ace/Addr.cpp @@ -2,19 +2,19 @@ // $Id$ #include "ace/Addr.h" -#include "ace/Log_Msg.h" -#include "ace/OS.h" - ACE_RCSID(ace, Addr, "$Id$") -// Note: this object requires static construction and destruction. -/* static */ -const ACE_Addr ACE_Addr::sap_any (AF_ANY, -1); - #if !defined (__ACE_INLINE__) #include "ace/Addr.i" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" +#include "ace/os_include/sys/os_socket.h" + +// Note: this object requires static construction and destruction. +/* static */ +const ACE_Addr ACE_Addr::sap_any (AF_ANY, -1); + ACE_ALLOC_HOOK_DEFINE(ACE_Addr) void diff --git a/ace/Arg_Shifter.cpp b/ace/Arg_Shifter.cpp index d174b4b0ef7..d179c5870c8 100644 --- a/ace/Arg_Shifter.cpp +++ b/ace/Arg_Shifter.cpp @@ -1,5 +1,6 @@ #include "ace/Arg_Shifter.h" -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_strings.h" #include "ace/OS_Errno.h" #include "ace/OS_Memory.h" @@ -113,14 +114,14 @@ ACE_Arg_Shifter::cur_arg_strncasecmp (const ACE_TCHAR *flag) // Check for a current argument if (this->is_anything_left()) { - size_t flag_length = ACE_OS_String::strlen (flag); + size_t flag_length = ACE_OS::strlen (flag); // Check for presence of the flag - if (ACE_OS_String::strncasecmp(this->temp_[current_index_], - flag, - flag_length) == 0) + if (ACE_OS::strncasecmp(this->temp_[current_index_], + flag, + flag_length) == 0) { - if (ACE_OS_String::strlen(temp_[current_index_]) == + if (ACE_OS::strlen(temp_[current_index_]) == flag_length) { // match and lengths are equal @@ -129,7 +130,7 @@ ACE_Arg_Shifter::cur_arg_strncasecmp (const ACE_TCHAR *flag) else { // matches, with more info to boot! - size_t remaining = ACE_OS_String::strspn + size_t remaining = ACE_OS::strspn (this->temp_[current_index_] + flag_length, ACE_LIB_TEXT (" ")) + flag_length; return ACE_static_cast (int, remaining); diff --git a/ace/Argv_Type_Converter.cpp b/ace/Argv_Type_Converter.cpp index 23ea5dd90ef..8d96ee77659 100644 --- a/ace/Argv_Type_Converter.cpp +++ b/ace/Argv_Type_Converter.cpp @@ -10,7 +10,7 @@ ACE_RCSID (ace, Argv_Type_Converter, "$Id$") -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" #include "ace/OS_Errno.h" #if defined (ACE_USES_WCHAR) @@ -28,7 +28,7 @@ ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int &argc, wchar_t** argv) for (int i = 0; i < argc; ++i) { this->char_argv_[i] = - ACE_OS_String::strdup (ACE_TEXT_ALWAYS_CHAR (argv[i])); + ACE_OS::strdup (ACE_TEXT_ALWAYS_CHAR (argv[i])); } } #endif // ACE_USES_WCHAR @@ -49,7 +49,7 @@ ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int &argc, char** argv) for (int i = 0; i < argc; ++i) { this->wchar_argv_[i] = - ACE_OS_String::strdup (ACE_TEXT_ANTI_TO_TCHAR (argv[i])); + ACE_OS::strdup (ACE_TEXT_ANTI_TO_TCHAR (argv[i])); } } #else @@ -117,14 +117,14 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void) while (wchar_argv_index < this->saved_argc_) { // if n'th entries of both argv lists are different - if (ACE_OS_String::strcmp(this->char_argv_[wchar_argv_index], + if (ACE_OS::strcmp(this->char_argv_[wchar_argv_index], ACE_TEXT_ALWAYS_CHAR (match_argv)) != 0) { // loop through the wchar argv list entries that are after // wchar_argv_index for (int i = wchar_argv_index + 1; i < before_pass_argc_; ++i) { - if (ACE_OS_String::strcmp (this->char_argv_[i], + if (ACE_OS::strcmp (this->char_argv_[i], ACE_TEXT_ALWAYS_CHAR (match_argv)) == 0) { @@ -153,7 +153,7 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void) while (char_argv_index < saved_argc_) { // if n'th entries of both argv lists are different - if (ACE_OS_String::strcmp ( + if (ACE_OS::strcmp ( ACE_TEXT_ALWAYS_CHAR (this->wchar_argv_[char_argv_index]), match_argv) != 0) { @@ -161,7 +161,7 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void) // wchar_argv_index for (int i = char_argv_index + 1; i < this->before_pass_argc_; ++i) { - if (ACE_OS_String::strcmp ( + if (ACE_OS::strcmp ( ACE_TEXT_ALWAYS_CHAR(this->wchar_argv_[i]), match_argv) == 0) { // swap the pointers in the char argv list diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp index 5070e55aa60..ace690bf0ce 100644 --- a/ace/Asynch_Acceptor.cpp +++ b/ace/Asynch_Acceptor.cpp @@ -15,7 +15,6 @@ ACE_RCSID(ace, Asynch_Acceptor, "$Id$") #if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) // This only works on platforms that support async i/o. -#include "ace/OS.h" #include "ace/Log_Msg.h" #include "ace/Message_Block.h" #include "ace/INET_Addr.h" diff --git a/ace/Asynch_IO_Impl.cpp b/ace/Asynch_IO_Impl.cpp index 8f26d82ae4b..b8cd305a2b9 100644 --- a/ace/Asynch_IO_Impl.cpp +++ b/ace/Asynch_IO_Impl.cpp @@ -5,7 +5,6 @@ #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) // This only works on Win32 platforms and on Unix platforms supporting // aio calls. -#include "ace/OS.h" #if !defined (__ACE_INLINE__) #include "ace/Asynch_IO_Impl.i" diff --git a/ace/Asynch_Pseudo_Task.cpp b/ace/Asynch_Pseudo_Task.cpp index 1e795b8c7e9..9996497475a 100644 --- a/ace/Asynch_Pseudo_Task.cpp +++ b/ace/Asynch_Pseudo_Task.cpp @@ -2,6 +2,8 @@ #include "ace/Asynch_Pseudo_Task.h" +#include "ace/OS_NS_signal.h" + ACE_RCSID(ace, Asynch_Pseudo_Task, "$Id$") ACE_Asynch_Pseudo_Task::ACE_Asynch_Pseudo_Task() diff --git a/ace/Atomic_Op.cpp b/ace/Atomic_Op.cpp index caec772adf8..daa6f93e98a 100644 --- a/ace/Atomic_Op.cpp +++ b/ace/Atomic_Op.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Atomic_Op.h" -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(ace, Atomic_Op, "$Id$") diff --git a/ace/Auto_Event.cpp b/ace/Auto_Event.cpp index ee217091021..2c29a7dd24e 100644 --- a/ace/Auto_Event.cpp +++ b/ace/Auto_Event.cpp @@ -9,6 +9,18 @@ ACE_RCSID(ace, Auto_Event, "$Id$") +ACE_Auto_Event::ACE_Auto_Event (int initial_state, + int type, + const char *name, + void *arg) + : ACE_Event (0, + initial_state, + type, + ACE_TEXT_CHAR_TO_TCHAR (name), + arg) +{ +} + #if defined (ACE_HAS_WCHAR) ACE_Auto_Event::ACE_Auto_Event (int initial_state, int type, diff --git a/ace/Barrier.cpp b/ace/Barrier.cpp index d9763395ee4..54d35411410 100644 --- a/ace/Barrier.cpp +++ b/ace/Barrier.cpp @@ -8,6 +8,8 @@ #include "ace/Barrier.inl" #endif /* __ACE_INLINE__ */ +#include "ace/Guard_T.h" + ACE_RCSID(ace, Barrier, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_Sub_Barrier) diff --git a/ace/Base_Thread_Adapter.cpp b/ace/Base_Thread_Adapter.cpp index b2f1326cf00..b6fcbb8f9eb 100644 --- a/ace/Base_Thread_Adapter.cpp +++ b/ace/Base_Thread_Adapter.cpp @@ -1,7 +1,6 @@ // $Id$ #include "ace/Base_Thread_Adapter.h" -#include "ace/OS.h" ACE_RCSID(ace, Base_Thread_Adapter, "$Id$") diff --git a/ace/Basic_Types.cpp b/ace/Basic_Types.cpp index f58419f09e8..eef8d0e18eb 100644 --- a/ace/Basic_Types.cpp +++ b/ace/Basic_Types.cpp @@ -1,4 +1,4 @@ -#include "ace/OS.h" +#include "ace/Basic_Types.h" #if !defined (__ACE_INLINE__) # include "ace/Basic_Types.i" diff --git a/ace/CDR_Base.cpp b/ace/CDR_Base.cpp index 402d3b2d139..50fda0659c5 100644 --- a/ace/CDR_Base.cpp +++ b/ace/CDR_Base.cpp @@ -1,11 +1,13 @@ #include "ace/CDR_Base.h" -#include "ace/Message_Block.h" -#include "ace/OS.h" #if !defined (__ACE_INLINE__) # include "ace/CDR_Base.inl" #endif /* ! __ACE_INLINE__ */ +#include "ace/Message_Block.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_string.h" + ACE_RCSID (ace, CDR_Base, "$Id$") diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i index 867a32983f7..48014ecbe43 100644 --- a/ace/CDR_Stream.i +++ b/ace/CDR_Stream.i @@ -249,7 +249,7 @@ ACE_OutputCDR::write_string (const ACE_CDR::Char *x) if (x != 0) { ACE_CDR::ULong len = - ACE_static_cast (ACE_CDR::ULong, ACE_OS_String::strlen (x)); + ACE_static_cast (ACE_CDR::ULong, ACE_OS::strlen (x)); return this->write_string (len, x); } return this->write_string (0, 0); @@ -259,7 +259,7 @@ ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::write_wstring (const ACE_CDR::WChar *x) { if (x != 0) - return this->write_wstring (ACE_OS_String::strlen (x), x); + return this->write_wstring (ACE_OS::strlen (x), x); return this->write_wstring (0, 0); } @@ -1125,7 +1125,7 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_string x) { ACE_CDR::ULong len = 0; if (x.val_ != 0) - len = ACE_static_cast (ACE_CDR::ULong, ACE_OS_String::strlen (x.val_)); + len = ACE_static_cast (ACE_CDR::ULong, ACE_OS::strlen (x.val_)); os.write_string (len, x.val_); return os.good_bit () && (!x.bound_ || len <= x.bound_); } @@ -1135,7 +1135,7 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wstring x) { ACE_CDR::ULong len = 0;; if (x.val_ != 0) - len = ACE_OS_String::strlen (x.val_); + len = ACE_OS::strlen (x.val_); os.write_wstring (len, x.val_); return os.good_bit () && (!x.bound_ || len <= x.bound_); } @@ -1261,7 +1261,7 @@ operator>> (ACE_InputCDR &is, ACE_InputCDR::to_string x) is.read_string (ACE_const_cast (char *&, x.val_)); // check if the bounds are satisfied return (is.good_bit () - && (!x.bound_ || ACE_OS_String::strlen (x.val_) <= x.bound_)); + && (!x.bound_ || ACE_OS::strlen (x.val_) <= x.bound_)); } ACE_INLINE ACE_CDR::Boolean @@ -1270,7 +1270,7 @@ operator>> (ACE_InputCDR &is, ACE_InputCDR::to_wstring x) is.read_wstring (ACE_const_cast (ACE_CDR::WChar *&, x.val_)); // check if the bounds are satisfied return (is.good_bit () - && (!x.bound_ || ACE_OS_String::strlen (x.val_) <= x.bound_)); + && (!x.bound_ || ACE_OS::strlen (x.val_) <= x.bound_)); } // *************************************************************************** diff --git a/ace/CE_Screen_Output.h b/ace/CE_Screen_Output.h index 0571fe39b88..5252b810fb1 100644 --- a/ace/CE_Screen_Output.h +++ b/ace/CE_Screen_Output.h @@ -21,7 +21,6 @@ #if defined (ACE_HAS_WINCE) -#include "ace/OS.h" #include "ace/Log_Msg_Callback.h" #include "ace/Log_Record.h" diff --git a/ace/CLASSIX/CLASSIX_OS.h b/ace/CLASSIX/CLASSIX_OS.h index aa2d213b655..83025d49d74 100644 --- a/ace/CLASSIX/CLASSIX_OS.h +++ b/ace/CLASSIX/CLASSIX_OS.h @@ -19,7 +19,7 @@ #define ACE_CLASSIX_OS_H /* ------------------------------------------------------------------------- */ -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/CLASSIX/CLASSIX_Port_Core.h b/ace/CLASSIX/CLASSIX_Port_Core.h index d0a409ae68d..75be7023f16 100644 --- a/ace/CLASSIX/CLASSIX_Port_Core.h +++ b/ace/CLASSIX/CLASSIX_Port_Core.h @@ -19,7 +19,7 @@ #define ACE_CLASSIX_PORT_CORE_H /* ------------------------------------------------------------------------- */ -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Capabilities.cpp b/ace/Capabilities.cpp index 9f5db74fc7d..80c8eb9ced6 100644 --- a/ace/Capabilities.cpp +++ b/ace/Capabilities.cpp @@ -1,10 +1,10 @@ #include "ace/Capabilities.h" -#include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) #include "ace/Capabilities.i" #endif /* !__ACE_INLINE__ */ +#include "ace/OS_NS_stdio.h" ACE_RCSID (ace, Capabilities, diff --git a/ace/Codecs.cpp b/ace/Codecs.cpp index 8d0aad7555d..872393086d6 100644 --- a/ace/Codecs.cpp +++ b/ace/Codecs.cpp @@ -1,6 +1,7 @@ -#include "ace/OS.h" #include "ace/Codecs.h" #include "ace/Log_Msg.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_ctype.h" ACE_RCSID (ace, Codecs, @@ -99,7 +100,7 @@ ACE_Base64::length (const ACE_Byte* input) ACE_Byte* ptr = ACE_const_cast (ACE_Byte*, input); while (*ptr != 0 && (member_[*(ptr)] == 1 || *ptr == pad_ - || ACE_OS_String::ace_isspace (*ptr))) + || ACE_OS::ace_isspace (*ptr))) ptr++; size_t len = ptr - input; len = ((len + 3) / 4) * 3 + 1 ; @@ -122,7 +123,7 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len) ACE_Byte* ptr = ACE_const_cast (ACE_Byte*, input); while (*ptr != 0 && (member_[*(ptr)] == 1 || *ptr == pad_ - || ACE_OS_String::ace_isspace (*ptr))) + || ACE_OS::ace_isspace (*ptr))) ptr++; size_t input_len = ptr - input; diff --git a/ace/Condition_Thread_Mutex.cpp b/ace/Condition_Thread_Mutex.cpp index d9fc98250f5..0c50c0c0373 100644 --- a/ace/Condition_Thread_Mutex.cpp +++ b/ace/Condition_Thread_Mutex.cpp @@ -17,6 +17,8 @@ #include "ace/Condition_Thread_Mutex.inl" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" + ACE_RCSID(ace, Condition_Thread_Mutex, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_Condition_Thread_Mutex) diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp index 10a3af85a6e..413d3f3c44e 100644 --- a/ace/Configuration.cpp +++ b/ace/Configuration.cpp @@ -216,7 +216,7 @@ ACE_Configuration::validate_name (const ACE_TCHAR* name, int allow_path) allow_path ? ACE_LIB_TEXT ("][") : ACE_LIB_TEXT ("\\]["); // Position of the first invalid character or terminating null. - size_t pos = ACE_OS_String::strcspn (name, reject); + size_t pos = ACE_OS::strcspn (name, reject); // Check if it is an invalid character. if (name[pos] != ACE_LIB_TEXT ('\0')) @@ -1634,7 +1634,7 @@ ACE_Configuration_Heap::open_section (const ACE_Configuration_Section_Key& base, result = base; for (const ACE_TCHAR* separator; - (separator = ACE_OS_String::strchr (sub_section, ACE_TEXT ('\\'))) != 0; + (separator = ACE_OS::strchr (sub_section, ACE_TEXT ('\\'))) != 0; ) { ACE_TString simple_section (sub_section, separator - sub_section); diff --git a/ace/Configuration_Import_Export.cpp b/ace/Configuration_Import_Export.cpp index 079bcda19e3..19913d4e00b 100644 --- a/ace/Configuration_Import_Export.cpp +++ b/ace/Configuration_Import_Export.cpp @@ -1,6 +1,9 @@ // $Id$ #include "ace/Configuration_Import_Export.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_ctype.h" + ACE_Config_ImpExp_Base::ACE_Config_ImpExp_Base (ACE_Configuration& config) : config_ (config) @@ -306,7 +309,7 @@ ACE_Registry_ImpExp::process_previous_line_format (ACE_TCHAR* buffer, ACE_Configuration_Section_Key& section) { // Chop any cr/lf at the end of the line. - ACE_TCHAR *endp = ACE_OS_String::strpbrk (buffer, ACE_LIB_TEXT ("\r\n")); + ACE_TCHAR *endp = ACE_OS::strpbrk (buffer, ACE_LIB_TEXT ("\r\n")); if (endp != 0) *endp = '\0'; @@ -597,15 +600,15 @@ ACE_Ini_ImpExp::squish (ACE_TCHAR *src) return 0; // Start at the end and work backwards over all whitespace. - for (cp = src + ACE_OS_String::strlen (src) - 1; + for (cp = src + ACE_OS::strlen (src) - 1; cp != src; --cp) - if (!ACE_OS_String::ace_isspace (*cp)) + if (!ACE_OS::ace_isspace (*cp)) break; cp[1] = '\0'; // Chop trailing whitespace // Now start at the beginning and move over all whitespace. - for (cp = src; ACE_OS_String::ace_isspace (*cp); ++cp) + for (cp = src; ACE_OS::ace_isspace (*cp); ++cp) continue; return cp; diff --git a/ace/DEV.cpp b/ace/DEV.cpp index 79f70a4e52d..613b47c0ebc 100644 --- a/ace/DEV.cpp +++ b/ace/DEV.cpp @@ -8,7 +8,7 @@ #include "ace/DEV.i" #endif -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(ace, DEV, "$Id$") diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h index 1c2bbee6c31..8db9b31d54f 100644 --- a/ace/DEV_IO.h +++ b/ace/DEV_IO.h @@ -25,6 +25,8 @@ #include "ace/os_include/os_stdio.h" #include "ace/os_include/sys/os_uio.h" +class ACE_Time_Value; + /** * @class ACE_DEV_IO * diff --git a/ace/DEV_IO.i b/ace/DEV_IO.i index a890cc96024..b491d130e80 100644 --- a/ace/DEV_IO.i +++ b/ace/DEV_IO.i @@ -3,6 +3,8 @@ // DEV_IO.i +#include "ace/OS_NS_sys_uio.h" + #include "ace/ACE.h" // Send exactly N bytes from BUF to this device. Keeping trying until diff --git a/ace/DLL.cpp b/ace/DLL.cpp index 2ec87488aa3..e42db1f700a 100644 --- a/ace/DLL.cpp +++ b/ace/DLL.cpp @@ -6,6 +6,8 @@ #include "ace/Log_Msg.h" #include "ace/ACE.h" #include "ace/DLL_Manager.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_dlfcn.h" ACE_RCSID(ace, DLL, "$Id$") @@ -119,7 +121,7 @@ ACE_DLL::open_i (const ACE_TCHAR *dll_filename, if (this->dll_handle_) { // If we have a good handle and its the same name, just return. - if (ACE_OS_String::strcmp (this->dll_name_, dll_filename) == 0) + if (ACE_OS::strcmp (this->dll_name_, dll_filename) == 0) return 0; else this->close (); diff --git a/ace/DLL_Manager.cpp b/ace/DLL_Manager.cpp index 02986399cfc..7d308fbf10e 100644 --- a/ace/DLL_Manager.cpp +++ b/ace/DLL_Manager.cpp @@ -7,12 +7,12 @@ #include "ace/ACE.h" #include "ace/Framework_Component.h" -#include "ace/OS.h" #include "ace/Lib_Find.h" #include "ace/Object_Manager.h" #include "ace/SString.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/Guard_T.h" +#include "ace/OS_NS_dlfcn.h" ACE_RCSID (ace, DLL_Manager, @@ -59,7 +59,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, if (this->dll_name_) { // Once dll_name_ has been set, it can't be changed.. - if (ACE_OS_String::strcmp (this->dll_name_, dll_name) != 0) + if (ACE_OS::strcmp (this->dll_name_, dll_name) != 0) { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, @@ -106,9 +106,9 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, // AIX often puts the shared library file (most often named shr.o) // inside an archive library. If this is an archive library // name, then try appending [shr.o] and retry. - if (0 != ACE_OS_String::strstr (dll_pathname, ACE_LIB_TEXT (".a"))) + if (0 != ACE_OS::strstr (dll_pathname, ACE_LIB_TEXT (".a"))) { - ACE_OS_String::strcat (dll_pathname, ACE_LIB_TEXT ("(shr.o)")); + ACE_OS::strcat (dll_pathname, ACE_LIB_TEXT ("(shr.o)")); open_mode |= RTLD_MEMBER; this->handle_ = ACE_OS::dlopen (dll_pathname, open_mode); } @@ -471,7 +471,7 @@ ACE_DLL_Manager::find_dll (const ACE_TCHAR *dll_name) const int i; for (i = 0; i < this->current_size_; i++) if (this->handle_vector_[i] && - ACE_OS_String::strcmp (this->handle_vector_[i]->dll_name (), dll_name) == 0) + ACE_OS::strcmp (this->handle_vector_[i]->dll_name (), dll_name) == 0) { return this->handle_vector_[i]; } diff --git a/ace/Date_Time.i b/ace/Date_Time.i index a3b26d21360..1e7768fca0d 100644 --- a/ace/Date_Time.i +++ b/ace/Date_Time.i @@ -3,8 +3,10 @@ // Date_Time.i -#include "ace/OS.h" +#include "ace/Global_Macros.h" #include "ace/Time_Value.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_time.h" ASYS_INLINE void ACE_Date_Time::update (void) diff --git a/ace/Dirent.h b/ace/Dirent.h index bf3732361ba..8a0792d3153 100644 --- a/ace/Dirent.h +++ b/ace/Dirent.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS_Dirent.h" +#include "ace/OS_NS_dirent.h" /** * @class ACE_Dirent diff --git a/ace/Dirent.i b/ace/Dirent.i index 4c731311c29..59b0969fa2d 100644 --- a/ace/Dirent.i +++ b/ace/Dirent.i @@ -11,11 +11,11 @@ ACE_Dirent::open (const ACE_TCHAR *dirname) if (this->dirp_ != 0) { - ACE_OS_Dirent::closedir (this->dirp_); + ACE_OS::closedir (this->dirp_); this->dirp_ = 0; } - this->dirp_ = ACE_OS_Dirent::opendir (dirname); + this->dirp_ = ACE_OS::opendir (dirname); if (this->dirp_ == 0) return -1; @@ -43,13 +43,13 @@ ACE_INLINE ACE_Dirent::~ACE_Dirent (void) { if (this->dirp_ != 0) - ACE_OS_Dirent::closedir (this->dirp_); + ACE_OS::closedir (this->dirp_); } ACE_INLINE dirent * ACE_Dirent::read (void) { - return this->dirp_ ? ACE_OS_Dirent::readdir (this->dirp_) : 0; + return this->dirp_ ? ACE_OS::readdir (this->dirp_) : 0; } ACE_INLINE int @@ -57,7 +57,7 @@ ACE_Dirent::read (struct dirent *entry, struct dirent **result) { return this->dirp_ - ? ACE_OS_Dirent::readdir_r (this->dirp_, entry, result) + ? ACE_OS::readdir_r (this->dirp_, entry, result) : 0; } @@ -66,7 +66,7 @@ ACE_Dirent::close (void) { if (this->dirp_ != 0) { - ACE_OS_Dirent::closedir (this->dirp_); + ACE_OS::closedir (this->dirp_); // Prevent double closure this->dirp_ = 0; @@ -77,19 +77,19 @@ ACE_INLINE void ACE_Dirent::rewind (void) { if (this->dirp_) - ACE_OS_Dirent::rewinddir (this->dirp_); + ACE_OS::rewinddir (this->dirp_); } ACE_INLINE void ACE_Dirent::seek (long loc) { if (this->dirp_) - ACE_OS_Dirent::seekdir (this->dirp_, loc); + ACE_OS::seekdir (this->dirp_, loc); } ACE_INLINE long ACE_Dirent::tell (void) { - return this->dirp_ ? ACE_OS_Dirent::telldir (this->dirp_) : 0; + return this->dirp_ ? ACE_OS::telldir (this->dirp_) : 0; } diff --git a/ace/Dirent_Selector.cpp b/ace/Dirent_Selector.cpp index bef6c40a8d1..213db98f4a2 100644 --- a/ace/Dirent_Selector.cpp +++ b/ace/Dirent_Selector.cpp @@ -1,12 +1,14 @@ // $Id$ -#include "ace/OS.h" #include "ace/Dirent_Selector.h" #if !defined (__ACE_INLINE__) #include "ace/Dirent_Selector.inl" #endif /* __ACE_INLINE__ */ +#include "ace/OS_NS_dirent.h" +#include "ace/OS_NS_stdlib.h" + ACE_RCSID (ace, Dirent_Selector, "$Id$") diff --git a/ace/Dirent_Selector.h b/ace/Dirent_Selector.h index c2b73c5906c..8985e4a930a 100644 --- a/ace/Dirent_Selector.h +++ b/ace/Dirent_Selector.h @@ -16,11 +16,13 @@ #define ACE_DIRENT_SELECTOR_H #include /**/ "ace/pre.h" +#include "ace/ACE_export.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/ACE_export.h" +#include "ace/os_include/os_dirent.h" /** * @class ACE_Dirent_Selector diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h index fc816597cca..e344e325486 100644 --- a/ace/Env_Value_T.h +++ b/ace/Env_Value_T.h @@ -25,8 +25,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" - /** * @class ACE_Env_Value * diff --git a/ace/Event.cpp b/ace/Event.cpp index 7656e51eeeb..06c14937acd 100644 --- a/ace/Event.cpp +++ b/ace/Event.cpp @@ -6,6 +6,8 @@ #include "ace/Event.inl" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" + ACE_RCSID(ace, Event, "$Id$") ACE_Event::ACE_Event (int manual_reset, diff --git a/ace/Event.h b/ace/Event.h index 7d9326a4be9..b160b14b3ac 100644 --- a/ace/Event.h +++ b/ace/Event.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/OS_NS_Thread.h" /** * @class ACE_Event diff --git a/ace/FIFO.cpp b/ace/FIFO.cpp index 50bae5e33a5..3a24e81d6e8 100644 --- a/ace/FIFO.cpp +++ b/ace/FIFO.cpp @@ -2,12 +2,16 @@ // $Id$ #include "ace/FIFO.h" -#include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) #include "ace/FIFO.i" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_errno.h" +#include "ace/OS_NS_sys_stat.h" + ACE_RCSID(ace, FIFO, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_FIFO) diff --git a/ace/FIFO.i b/ace/FIFO.i index d640bb8141f..0c91ceaca3f 100644 --- a/ace/FIFO.i +++ b/ace/FIFO.i @@ -3,6 +3,8 @@ // FIFO.i +#include "ace/OS_NS_unistd.h" + ACE_INLINE int ACE_FIFO::get_local_addr (const ACE_TCHAR *&r) const { diff --git a/ace/FIFO_Recv.i b/ace/FIFO_Recv.i index 82f1317d013..29d951b044d 100644 --- a/ace/FIFO_Recv.i +++ b/ace/FIFO_Recv.i @@ -3,7 +3,6 @@ // FIFO_Recv.i -#include "ace/OS.h" #include "ace/ACE.h" ASYS_INLINE ssize_t diff --git a/ace/FIFO_Recv_Msg.cpp b/ace/FIFO_Recv_Msg.cpp index 6de0d35cd72..2c01f948e54 100644 --- a/ace/FIFO_Recv_Msg.cpp +++ b/ace/FIFO_Recv_Msg.cpp @@ -2,12 +2,13 @@ // $Id$ #include "ace/FIFO_Recv_Msg.h" -#include "ace/Log_Msg.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/FIFO_Recv_Msg.i" #endif +#include "ace/Log_Msg.h" + ACE_RCSID(ace, FIFO_Recv_Msg, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv_Msg) diff --git a/ace/FIFO_Recv_Msg.i b/ace/FIFO_Recv_Msg.i index 8ba99042003..a29d8f345fc 100644 --- a/ace/FIFO_Recv_Msg.i +++ b/ace/FIFO_Recv_Msg.i @@ -3,6 +3,8 @@ // FIFO_Recv_Msg.i +#include "ace/Min_Max.h" + ASYS_INLINE ssize_t ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg) { diff --git a/ace/FIFO_Send.i b/ace/FIFO_Send.i index bcc7abecb93..9b85feb9902 100644 --- a/ace/FIFO_Send.i +++ b/ace/FIFO_Send.i @@ -3,7 +3,6 @@ // FIFO_Send.i -#include "ace/OS.h" #include "ace/ACE.h" ASYS_INLINE ssize_t diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp index bddba5baf38..c5173781581 100644 --- a/ace/FIFO_Send_Msg.cpp +++ b/ace/FIFO_Send_Msg.cpp @@ -1,12 +1,14 @@ // $Id$ #include "ace/FIFO_Send_Msg.h" -#include "ace/Log_Msg.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/FIFO_Send_Msg.i" #endif +#include "ace/Log_Msg.h" +#include "ace/OS_NS_sys_uio.h" + ACE_RCSID(ace, FIFO_Send_Msg, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send_Msg) diff --git a/ace/FILE.cpp b/ace/FILE.cpp index 70e6f437b1d..a2734680901 100644 --- a/ace/FILE.cpp +++ b/ace/FILE.cpp @@ -10,7 +10,8 @@ #include "ace/FILE.i" #endif -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_stat.h" ACE_RCSID(ace, FILE, "$Id$") diff --git a/ace/FILE_IO.cpp b/ace/FILE_IO.cpp index 366ffde711a..4f6226151e5 100644 --- a/ace/FILE_IO.cpp +++ b/ace/FILE_IO.cpp @@ -2,12 +2,14 @@ // $Id$ #include "ace/FILE_IO.h" -#include "ace/Log_Msg.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/FILE_IO.i" #endif +#include "ace/Log_Msg.h" +#include "ace/OS_NS_sys_stat.h" + ACE_RCSID(ace, FILE_IO, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_FILE_IO) diff --git a/ace/FILE_IO.i b/ace/FILE_IO.i index fd9a634a1be..7100c980032 100644 --- a/ace/FILE_IO.i +++ b/ace/FILE_IO.i @@ -4,6 +4,7 @@ // FILE_IO.i #include "ace/ACE.h" +#include "ace/OS_NS_sys_uio.h" ASYS_INLINE ssize_t ACE_FILE_IO::sendv_n (const iovec iov[], int n) const diff --git a/ace/File_Lock.h b/ace/File_Lock.h index 5d7b578ef8e..90bd40dedfa 100644 --- a/ace/File_Lock.h +++ b/ace/File_Lock.h @@ -14,12 +14,14 @@ #define ACE_FILE_LOCK_H #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS_NS_stdio.h" + /** * @class ACE_File_Lock * diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp index 68ab4bf6ce0..065e84bf651 100644 --- a/ace/Filecache.cpp +++ b/ace/Filecache.cpp @@ -4,6 +4,7 @@ #include "ace/Object_Manager.h" #include "ace/Log_Msg.h" #include "ace/ACE.h" +#include "ace/OS_NS_time.h" ACE_RCSID(ace, Filecache, "$Id$") diff --git a/ace/Filecache.h b/ace/Filecache.h index 9a6702356fc..036468b7f14 100644 --- a/ace/Filecache.h +++ b/ace/Filecache.h @@ -27,6 +27,7 @@ #include "ace/Null_Mutex.h" #include "ace/Synch_Traits.h" #include "ace/RW_Thread_Mutex.h" +#include "ace/OS_NS_sys_stat.h" enum ACE_Filecache_Flag { diff --git a/ace/Flag_Manip.i b/ace/Flag_Manip.i index 57f6aad2fbb..4207cebb6be 100644 --- a/ace/Flag_Manip.i +++ b/ace/Flag_Manip.i @@ -3,7 +3,7 @@ // Return flags currently associated with handle. -#include "ace/OS.h" +#include "ace/OS_NS_fcntl.h" ASYS_INLINE int ACE_Flag_Manip::get_flags (ACE_HANDLE handle) diff --git a/ace/Framework_Component.cpp b/ace/Framework_Component.cpp index e5786d341f9..148601186b8 100644 --- a/ace/Framework_Component.cpp +++ b/ace/Framework_Component.cpp @@ -11,6 +11,7 @@ #include "ace/Log_Msg.h" #include "ace/DLL_Manager.h" #include "ace/Recursive_Thread_Mutex.h" +#include "ace/OS_NS_string.h" ACE_RCSID(ace, Framework_Component, "$Id$") @@ -158,7 +159,7 @@ ACE_Framework_Repository::remove_component (const ACE_TCHAR *name) for (i = 0; i < this->current_size_; i++) if (this->component_vector_[i] && - ACE_OS_String::strcmp (this->component_vector_[i]->name_, name) == 0) + ACE_OS::strcmp (this->component_vector_[i]->name_, name) == 0) { delete this->component_vector_[i]; this->component_vector_[i] = 0; @@ -191,7 +192,7 @@ ACE_Framework_Repository::remove_dll_components_i (const ACE_TCHAR *dll_name) for (i = 0; i < this->current_size_; i++) if (this->component_vector_[i] && - ACE_OS_String::strcmp (this->component_vector_[i]->dll_name_, dll_name) == 0) + ACE_OS::strcmp (this->component_vector_[i]->dll_name_, dll_name) == 0) { if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, diff --git a/ace/Functor.i b/ace/Functor.i index 25dedd00d6b..d008cb61285 100644 --- a/ace/Functor.i +++ b/ace/Functor.i @@ -30,7 +30,7 @@ // ============================================================================ #include "ace/ACE.h" -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" ////////////////////////////////////////////////////////////// // GOF Command Pattern Classes and Template Specializations // @@ -137,14 +137,14 @@ ACE_Hash<void *>::operator () (const void *t) const ACE_INLINE int ACE_Equal_To<const ACE_TCHAR *>::operator () (const ACE_TCHAR *lhs, const ACE_TCHAR *rhs) const { - return !ACE_OS_String::strcmp (lhs, rhs); + return !ACE_OS::strcmp (lhs, rhs); } //ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Equal_To<ACE_TCHAR *>::operator () (const ACE_TCHAR *lhs, const ACE_TCHAR *rhs) const { - return !ACE_OS_String::strcmp (lhs, rhs); + return !ACE_OS::strcmp (lhs, rhs); } ACE_INLINE int @@ -186,14 +186,14 @@ ACE_Equal_To<ACE_UINT64>::operator () (const ACE_UINT64 lhs, const ACE_UINT64 rh ACE_INLINE int ACE_Less_Than<const ACE_TCHAR *>::operator () (const ACE_TCHAR *lhs, const ACE_TCHAR *rhs) const { - return (ACE_OS_String::strcmp (lhs, rhs) < 0) ? 1 : 0; + return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0; } //ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Less_Than<ACE_TCHAR *>::operator () (const ACE_TCHAR *lhs, const ACE_TCHAR *rhs) const { - return (ACE_OS_String::strcmp (lhs, rhs) < 0) ? 1 : 0; + return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0; } @@ -217,28 +217,28 @@ ACE_Hash<ACE_ANTI_TCHAR *>::operator () (const ACE_ANTI_TCHAR *t) const ACE_INLINE int ACE_Equal_To<const ACE_ANTI_TCHAR *>::operator () (const ACE_ANTI_TCHAR *lhs, const ACE_ANTI_TCHAR *rhs) const { - return !ACE_OS_String::strcmp (lhs, rhs); + return !ACE_OS::strcmp (lhs, rhs); } //ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Equal_To<ACE_ANTI_TCHAR *>::operator () (const ACE_ANTI_TCHAR *lhs, const ACE_ANTI_TCHAR *rhs) const { - return !ACE_OS_String::strcmp (lhs, rhs); + return !ACE_OS::strcmp (lhs, rhs); } //ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Less_Than<const ACE_ANTI_TCHAR *>::operator () (const ACE_ANTI_TCHAR *lhs, const ACE_ANTI_TCHAR *rhs) const { - return (ACE_OS_String::strcmp (lhs, rhs) < 0) ? 1 : 0; + return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0; } //ACE_TEMPLATE_METHOD_SPECIALIZATION ACE_INLINE int ACE_Less_Than<ACE_ANTI_TCHAR *>::operator () (const ACE_ANTI_TCHAR *lhs, const ACE_ANTI_TCHAR *rhs) const { - return (ACE_OS_String::strcmp (lhs, rhs) < 0) ? 1 : 0; + return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0; } #endif // ACE_USES_WCHAR diff --git a/ace/Future.h b/ace/Future.h index 572a667ad9d..cf361e61f0f 100644 --- a/ace/Future.h +++ b/ace/Future.h @@ -26,6 +26,9 @@ #if defined (ACE_HAS_THREADS) +#include "ace/Recursive_Thread_Mutex.h" +#include "ace/Condition_Recursive_Thread_Mutex.h" + // Forward decl. template <class T> class ACE_Future_Holder; template <class T> class ACE_Future_Observer; diff --git a/ace/Guard_T.h b/ace/Guard_T.h index 1638e7c6071..552385b298e 100644 --- a/ace/Guard_T.h +++ b/ace/Guard_T.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Global_Macros.h" -#include "ace/OS.h" // for ACE_thread_key_t +#include "ace/OS_NS_Thread.h" /** * @class ACE_Guard diff --git a/ace/Guard_T.inl b/ace/Guard_T.inl index d80d7e26e65..0ce34431d2c 100644 --- a/ace/Guard_T.inl +++ b/ace/Guard_T.inl @@ -1,6 +1,8 @@ /* -*- C++ -*- */ // $Id$ +#include "ace/RW_Thread_Mutex.h" + template <class ACE_LOCK> ACE_INLINE int ACE_Guard<ACE_LOCK>::acquire (void) { diff --git a/ace/Handle_Gobbler.h b/ace/Handle_Gobbler.h index 7b3528f6af3..e506e0c1f75 100644 --- a/ace/Handle_Gobbler.h +++ b/ace/Handle_Gobbler.h @@ -15,14 +15,12 @@ #define ACE_HANDLE_GOBBLER_H #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/Unbounded_Set.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Unbounded_Set.h" - /** * @class ACE_Handle_Gobbler * diff --git a/ace/Handle_Ops.cpp b/ace/Handle_Ops.cpp index 80b58ec7e15..f2fbefa9177 100644 --- a/ace/Handle_Ops.cpp +++ b/ace/Handle_Ops.cpp @@ -6,7 +6,9 @@ #include "ace/Handle_Ops.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ -#include "ace/OS.h" +#include "ace/OS_NS_errno.h" +#include "ace/OS_NS_fcntl.h" +#include "ace/Time_Value.h" ACE_RCSID(ace, Handle_Ops, "$Id$") diff --git a/ace/Handle_Set.cpp b/ace/Handle_Set.cpp index 4f3f31fdc36..5b65dbf9fd4 100644 --- a/ace/Handle_Set.cpp +++ b/ace/Handle_Set.cpp @@ -7,7 +7,7 @@ #include "ace/Handle_Set.i" #endif /* __ACE_INLINE__ */ -#include "ace/OS.h" +#include "ace/OS_NS_string.h" ACE_RCSID(ace, Handle_Set, "$Id$") diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp index 87e2bf136b3..a6d5167bf11 100644 --- a/ace/High_Res_Timer.cpp +++ b/ace/High_Res_Timer.cpp @@ -14,6 +14,11 @@ #endif /* __ACE_INLINE__ */ #include "ace/Stats.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(ace, High_Res_Timer, "$Id$") diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h index ee948fb962c..94b883dab7d 100644 --- a/ace/High_Res_Timer.h +++ b/ace/High_Res_Timer.h @@ -20,7 +20,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/Basic_Types.h" +#include "ace/OS_NS_time.h" +#include "ace/Time_Value.h" /** * @class ACE_High_Res_Timer diff --git a/ace/High_Res_Timer.i b/ace/High_Res_Timer.i index 34c494dce16..52a47595acb 100644 --- a/ace/High_Res_Timer.i +++ b/ace/High_Res_Timer.i @@ -1,6 +1,8 @@ /* -*- C++ -*- */ // $Id$ +#include "ace/Global_Macros.h" + // Be very carefull before changing the calculations inside // ACE_High_Res_Timer. The precision matters and we are using integer // calculations not floating point. Also look good at the emulated 64 diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp index a2e6d696829..bd10c7ba7c5 100644 --- a/ace/INET_Addr.cpp +++ b/ace/INET_Addr.cpp @@ -3,12 +3,20 @@ // Defines the Internet domain address family address format. #include "ace/INET_Addr.h" -#include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) #include "ace/INET_Addr.i" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_errno.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_arpa_inet.h" +#include "ace/OS_NS_netdb.h" +#include "ace/OS_NS_unistd.h" + ACE_RCSID (ace, INET_Addr, "$Id$") @@ -136,7 +144,7 @@ ACE_INET_Addr::string_to_addr (const char s[]) { char *endp = 0; u_short port = ACE_static_cast (u_short, - ACE_OS_String::strtol (ip_addr, &endp, 10)); + ACE_OS::strtol (ip_addr, &endp, 10)); if (port > 0 && *endp == '\0') result = this->set (port, ACE_UINT32 (INADDR_ANY)); else // port name @@ -148,7 +156,7 @@ ACE_INET_Addr::string_to_addr (const char s[]) char *endp = 0; u_short port = ACE_static_cast (u_short, - ACE_OS_String::strtol (port_p, &endp, 10)); + ACE_OS::strtol (port_p, &endp, 10)); if (port > 0 && *endp == '\0') result = this->set (port, ip_addr); else @@ -231,14 +239,14 @@ ACE_INET_Addr::set (u_short port_number, return -1; } - ACE_OS_String::memset ((void *) &this->inet_addr_, - 0, - sizeof this->inet_addr_); + ACE_OS::memset ((void *) &this->inet_addr_, + 0, + sizeof this->inet_addr_); #if defined (ACE_HAS_IPV6) struct addrinfo hints, *res, *res0; int error; - ACE_OS_String::memset (&hints, 0, sizeof (hints)); + ACE_OS::memset (&hints, 0, sizeof (hints)); hints.ai_family = address_family; @@ -292,9 +300,9 @@ ACE_INET_Addr::set (u_short port_number, } else { - (void) ACE_OS_String::memcpy ((void *) &addrv4.s_addr, - hp->h_addr, - hp->h_length); + (void) ACE_OS::memcpy ((void *) &addrv4.s_addr, + hp->h_addr, + hp->h_length); return this->set (port_number, encode ? ntohl (addrv4.s_addr) : addrv4.s_addr, encode); @@ -313,7 +321,7 @@ static int get_port_number_from_name (const char port_name[], // Maybe port_name is directly a port number? char *endp = 0; port_number = ACE_static_cast (int, - ACE_OS_String::strtol (port_name, &endp, 10)); + ACE_OS::strtol (port_name, &endp, 10)); if (port_number > 0 && *endp == '\0') { // Ok, port_name was really a number, and nothing else. We @@ -364,7 +372,7 @@ ACE_INET_Addr::set (const char port_name[], int address_family = PF_UNSPEC; # if defined (ACE_HAS_IPV6) - if (ACE_OS_String::strcmp (protocol, ACE_LIB_TEXT ("tcp6")) == 0) + if (ACE_OS::strcmp (protocol, ACE_LIB_TEXT ("tcp6")) == 0) address_family = AF_INET6; # endif /* ACE_HAS_IPV6 */ @@ -641,8 +649,8 @@ ACE_INET_Addr::get_host_name (wchar_t hostname[], // And copy it over, if successful if (result == 0) - ACE_OS_String::strcpy (hostname, - ACE_Ascii_To_Wide (char_hostname).wchar_rep ()); + ACE_OS::strcpy (hostname, + ACE_Ascii_To_Wide (char_hostname).wchar_rep ()); return result; } @@ -686,9 +694,9 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const #if defined (ACE_HAS_IPV6) if ((this->get_type () == PF_INET6 && - 0 == ACE_OS_String::memcmp (&this->inet_addr_.in6_.sin6_addr, - &in6addr_any, - sizeof (this->inet_addr_.in6_.sin6_addr))) + 0 == ACE_OS::memcmp (&this->inet_addr_.in6_.sin6_addr, + &in6addr_any, + sizeof (this->inet_addr_.in6_.sin6_addr))) || (this->get_type () == PF_INET && this->inet_addr_.in4_.sin_addr.s_addr == INADDR_ANY)) @@ -781,9 +789,9 @@ int ACE_INET_Addr::set_address (const char *ip_addr, this->base_set (AF_INET, sizeof (this->inet_addr_.in4_)); this->inet_addr_.in4_.sin_family = AF_INET; this->set_size (sizeof (this->inet_addr_.in4_)); - ACE_OS_String::memcpy (&this->inet_addr_.in4_.sin_addr, - &ip4, - len); + ACE_OS::memcpy (&this->inet_addr_.in4_.sin_addr, + &ip4, + len); } #if defined (ACE_HAS_IPV6) // If given an IPv4 address to copy to an IPv6 object, map it to @@ -796,17 +804,17 @@ int ACE_INET_Addr::set_address (const char *ip_addr, if (ip4 == INADDR_ANY) { in6_addr ip6 = in6addr_any; - ACE_OS_String::memcpy (&this->inet_addr_.in6_.sin6_addr, - &ip6, - sizeof (ip6)); + ACE_OS::memcpy (&this->inet_addr_.in6_.sin6_addr, + &ip6, + sizeof (ip6)); return 0; } if (ip4 == INADDR_LOOPBACK) { in6_addr ip6 = in6addr_loopback; - ACE_OS_String::memcpy (&this->inet_addr_.in6_.sin6_addr, - &ip6, - sizeof (ip6)); + ACE_OS::memcpy (&this->inet_addr_.in6_.sin6_addr, + &ip6, + sizeof (ip6)); return 0; } @@ -823,9 +831,9 @@ int ACE_INET_Addr::set_address (const char *ip_addr, ip4 }; - ACE_OS_String::memcpy (&this->inet_addr_.in6_.sin6_addr, - &newaddress, - sizeof (newaddress)); + ACE_OS::memcpy (&this->inet_addr_.in6_.sin6_addr, + &newaddress, + sizeof (newaddress)); } #endif /* ACE_HAS_IPV6 */ @@ -842,7 +850,7 @@ int ACE_INET_Addr::set_address (const char *ip_addr, // We protect ourselves up above so IPv6 must be possible here. this->base_set (AF_INET6, sizeof (this->inet_addr_.in6_)); this->inet_addr_.in6_.sin6_family = AF_INET6; - ACE_OS_String::memcpy (&this->inet_addr_.in6_.sin6_addr, ip_addr, len); + ACE_OS::memcpy (&this->inet_addr_.in6_.sin6_addr, ip_addr, len); return 0; } /* end len == 16 */ @@ -932,7 +940,7 @@ ACE_INET_Addr::get_ip_address (void) const // Return the last 32 bits of the address char *thisaddrptr = (char*)this->ip_addr_pointer (); thisaddrptr += 128/8 - 32/8; - ACE_OS_String::memcpy (&addr, thisaddrptr, sizeof (addr)); + ACE_OS::memcpy (&addr, thisaddrptr, sizeof (addr)); return ACE_NTOHL (addr); } diff --git a/ace/INET_Addr.i b/ace/INET_Addr.i index 04164870c02..6f05f0c79d9 100644 --- a/ace/INET_Addr.i +++ b/ace/INET_Addr.i @@ -3,7 +3,8 @@ // INET_Addr.i -#include "ace/OS.h" +#include "ace/OS_NS_string.h" +#include "ace/Global_Macros.h" // Default dtor. ACE_INLINE diff --git a/ace/IOStream.h b/ace/IOStream.h index 8dae6b38859..62523df7970 100644 --- a/ace/IOStream.h +++ b/ace/IOStream.h @@ -34,7 +34,6 @@ #if !defined (ACE_LACKS_ACE_IOSTREAM) -#include "ace/OS.h" #include "ace/streams.h" #if defined (ACE_HAS_STRING_CLASS) diff --git a/ace/IO_Cntl_Msg.h b/ace/IO_Cntl_Msg.h index 5882c4d0f3e..441206cf184 100644 --- a/ace/IO_Cntl_Msg.h +++ b/ace/IO_Cntl_Msg.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" - /** * @class ACE_IO_Cntl_Msg * @@ -48,7 +46,7 @@ public: MOD_UNLINK = 6 }; - typedef u_short ACE_IO_Cntl_Cmds; + typedef unsigned short ACE_IO_Cntl_Cmds; // = Initialization method. /// Initialize the control message. diff --git a/ace/IO_SAP.cpp b/ace/IO_SAP.cpp index 272894102a2..e41bf98a3ff 100644 --- a/ace/IO_SAP.cpp +++ b/ace/IO_SAP.cpp @@ -2,12 +2,15 @@ // $Id$ #include "ace/IO_SAP.h" -#include "ace/Log_Msg.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/IO_SAP.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#include "ace/Log_Msg.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_errno.h" + ACE_RCSID(ace, IO_SAP, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_IO_SAP) diff --git a/ace/IO_SAP.i b/ace/IO_SAP.i index 5bb805d48f4..e6b1dfd9dd5 100644 --- a/ace/IO_SAP.i +++ b/ace/IO_SAP.i @@ -3,6 +3,8 @@ // IO_SAP.i +#include "ace/OS_NS_stropts.h" + ASYS_INLINE ACE_IO_SAP::~ACE_IO_SAP (void) { diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp index d50d0580073..a14ed05889b 100644 --- a/ace/IPC_SAP.cpp +++ b/ace/IPC_SAP.cpp @@ -1,12 +1,15 @@ // $Id$ #include "ace/IPC_SAP.h" -#include "ace/Log_Msg.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/IPC_SAP.i" #endif +#include "ace/Log_Msg.h" +#include "ace/OS_NS_unistd.h" +#include "ace/os_include/os_signal.h" + ACE_RCSID(ace, IPC_SAP, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_IPC_SAP) diff --git a/ace/IPC_SAP.i b/ace/IPC_SAP.i index 63ccc967711..1d2c53b2783 100644 --- a/ace/IPC_SAP.i +++ b/ace/IPC_SAP.i @@ -3,6 +3,8 @@ // IPC_SAP.i +#include "ace/OS_NS_stropts.h" + // Used to return the underlying handle_. ASYS_INLINE diff --git a/ace/LOCK_SOCK_Acceptor.cpp b/ace/LOCK_SOCK_Acceptor.cpp index 931216750ae..7c3f1763f14 100644 --- a/ace/LOCK_SOCK_Acceptor.cpp +++ b/ace/LOCK_SOCK_Acceptor.cpp @@ -3,7 +3,7 @@ #ifndef ACE_LOCK_SOCK_ACCEPTOR_CPP #define ACE_LOCK_SOCK_ACCEPTOR_CPP -#include "ace/Synch.h" +#include "ace/Guard_T.h" #include "ace/LOCK_SOCK_Acceptor.h" ACE_RCSID(ace, LOCK_SOCK_Acceptor, "$Id$") diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp index d5ad37134e7..a6f3e8d814f 100644 --- a/ace/Lib_Find.cpp +++ b/ace/Lib_Find.cpp @@ -2,7 +2,13 @@ #include "ace/Lib_Find.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_errno.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_fcntl.h" ACE_RCSID(ace, Lib_Find, "$Id$") @@ -112,7 +118,7 @@ ACE_Lib_Find::ldfind (const ACE_TCHAR* filename, #if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) size_t len_searchfilename = ACE_OS::strlen (searchfilename); if (! got_suffix) - ACE_OS_String::strcpy (searchfilename + len_searchfilename, + ACE_OS::strcpy (searchfilename + len_searchfilename, decorator); for (int tag = 1; tag >= 0; tag --) diff --git a/ace/Lock_Adapter_T.cpp b/ace/Lock_Adapter_T.cpp index 792c1bf9e1e..ab69d2387bb 100644 --- a/ace/Lock_Adapter_T.cpp +++ b/ace/Lock_Adapter_T.cpp @@ -4,6 +4,7 @@ #define ACE_LOCK_ADAPTER_T_C #include "ace/Lock_Adapter_T.h" +#include "ace/OS_Memory.h" // for ACE_NEW #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index a3f54995f28..a4a33298aca 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -11,7 +11,11 @@ #include "ace/ACE.h" #include "ace/Thread_Manager.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_errno.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_wchar.h" +#include "ace/OS_NS_signal.h" #if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE == 0) # include "ace/Object_Manager.h" @@ -1173,11 +1177,11 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, va_arg (argp, ACE_TCHAR *), - ACE_TEXT_CHAR_TO_TCHAR (ACE_OS_String::strerror (errno))); + ACE_TEXT_CHAR_TO_TCHAR (ACE_OS::strerror (errno))); else this_len = ACE_OS::sprintf (bp, format, va_arg (argp, ACE_TCHAR *), - ACE_TEXT_CHAR_TO_TCHAR (ACE_OS_String::strerror (errno))); + ACE_TEXT_CHAR_TO_TCHAR (ACE_OS::strerror (errno))); } else #endif /* !ACE_HAS_WINCE */ @@ -1283,10 +1287,10 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, - ACE_OS_String::strerror (errno)); + ACE_OS::strerror (errno)); else this_len = ACE_OS::sprintf - (bp, format, ACE_OS_String::strerror (errno)); + (bp, format, ACE_OS::strerror (errno)); } else { @@ -2067,7 +2071,7 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority, // 58 for the HEXDUMP header; ACE_TCHAR *msg_buf; - const size_t text_sz = text ? ACE_OS_String::strlen(text) : 0; + const size_t text_sz = text ? ACE_OS::strlen(text) : 0; ACE_NEW_RETURN (msg_buf, ACE_TCHAR[text_sz + 58], -1); diff --git a/ace/Log_Msg_NT_Event_Log.cpp b/ace/Log_Msg_NT_Event_Log.cpp index d00e23ee475..a9d61084be1 100644 --- a/ace/Log_Msg_NT_Event_Log.cpp +++ b/ace/Log_Msg_NT_Event_Log.cpp @@ -32,7 +32,7 @@ ACE_Log_Msg_NT_Event_Log::open (const ACE_TCHAR *logger_key) MAXPATHLEN)) return -1; DWORD msg_file_length = ACE_static_cast (DWORD, - ACE_OS_String::strlen (msg_file)); + ACE_OS::strlen (msg_file)); // If a logger_key has been supplied then we use that as the event // source name, otherwise we default to the program name. diff --git a/ace/Log_Msg_UNIX_Syslog.cpp b/ace/Log_Msg_UNIX_Syslog.cpp index 7c7af9bbeb5..b48e002660e 100644 --- a/ace/Log_Msg_UNIX_Syslog.cpp +++ b/ace/Log_Msg_UNIX_Syslog.cpp @@ -8,6 +8,7 @@ #include "ace/Log_Msg.h" #include "ace/Log_Msg_UNIX_Syslog.h" #include "ace/Log_Record.h" +#include "ace/os_include/os_syslog.h" // NOTE: // The ACE_Log_Msg_UNIX_Syslog class can use the openlog(), @@ -83,13 +84,13 @@ ACE_Log_Msg_UNIX_Syslog::log (ACE_Log_Record &log_record) ACE_OS::strcpy (message, log_record.msg_data ()); ACE_TCHAR *strtokp; - for (ACE_TCHAR *line = ACE_OS_String::strtok_r (message, - ACE_LIB_TEXT ("\n"), - &strtokp); + for (ACE_TCHAR *line = ACE_OS::strtok_r (message, + ACE_LIB_TEXT ("\n"), + &strtokp); line != 0; - line = ACE_OS_String::strtok_r (0, - ACE_LIB_TEXT ("\n"), - &strtokp)) + line = ACE_OS::strtok_r (0, + ACE_LIB_TEXT ("\n"), + &strtokp)) { // Format the message line. Note that the processing for // VERBOSE is the same as for VERBOSE_LITE, since syslog() diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp index 635dfb9224e..056050b55cc 100644 --- a/ace/Log_Record.cpp +++ b/ace/Log_Record.cpp @@ -1,17 +1,20 @@ // $Id$ #include "ace/Log_Record.h" + +#if defined (ACE_LACKS_INLINE_FUNCTIONS) +# include "ace/Log_Record.i" +#endif + #include "ace/Log_Msg.h" #include "ace/ACE.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_time.h" #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) # include "ace/streams.h" #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -# include "ace/Log_Record.i" -#endif - ACE_RCSID(ace, Log_Record, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_Log_Record) diff --git a/ace/Log_Record.i b/ace/Log_Record.i index 6720391a9a8..a61bc5415e0 100644 --- a/ace/Log_Record.i +++ b/ace/Log_Record.i @@ -5,7 +5,7 @@ #include "ace/Global_Macros.h" #include "ace/os_include/arpa/os_inet.h" #include "ace/Time_Value.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" ASYS_INLINE ACE_Log_Record::~ACE_Log_Record (void) diff --git a/ace/Logging_Strategy.cpp b/ace/Logging_Strategy.cpp index 9834c7ee5f3..472d7226622 100644 --- a/ace/Logging_Strategy.cpp +++ b/ace/Logging_Strategy.cpp @@ -1,12 +1,14 @@ // $Id$ +#include "ace/Logging_Strategy.h" #include "ace/ACE.h" #include "ace/Get_Opt.h" #include "ace/streams.h" #include "ace/Lib_Find.h" #include "ace/Log_Msg.h" #include "ace/Reactor.h" -#include "ace/Logging_Strategy.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(lib, Logging_Strategy, "$Id$") @@ -30,13 +32,13 @@ ACE_Logging_Strategy::priorities (ACE_TCHAR *priority_string, // Parse string and alternate priority mask. - for (ACE_TCHAR *priority = ACE_OS_String::strtok_r (priority_string, - ACE_LIB_TEXT ("|"), - &strtokp); + for (ACE_TCHAR *priority = ACE_OS::strtok_r (priority_string, + ACE_LIB_TEXT ("|"), + &strtokp); priority != 0; - priority = ACE_OS_String::strtok_r (0, - ACE_LIB_TEXT ("|"), - &strtokp)) + priority = ACE_OS::strtok_r (0, + ACE_LIB_TEXT ("|"), + &strtokp)) { if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("SHUTDOWN")) == 0) ACE_SET_BITS (priority_mask, LM_SHUTDOWN); diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp index 57d4dc3fa1c..2a458aedbb3 100644 --- a/ace/MEM_Acceptor.cpp +++ b/ace/MEM_Acceptor.cpp @@ -9,6 +9,8 @@ #include "ace/MEM_Acceptor.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#include "ace/OS_NS_stdio.h" + ACE_RCSID(ace, MEM_Acceptor, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Acceptor) diff --git a/ace/MEM_Addr.cpp b/ace/MEM_Addr.cpp index ed8bfa3e07e..22c7ab04912 100644 --- a/ace/MEM_Addr.cpp +++ b/ace/MEM_Addr.cpp @@ -6,13 +6,14 @@ #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#include "ace/Log_Msg.h" -#include "ace/OS.h" - #if !defined (__ACE_INLINE__) #include "ace/MEM_Addr.i" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_NS_unistd.h" + ACE_RCSID (ace, MEM_Addr, "$Id$") diff --git a/ace/MEM_Addr.i b/ace/MEM_Addr.i index e2cb980a34b..d5b42015724 100644 --- a/ace/MEM_Addr.i +++ b/ace/MEM_Addr.i @@ -3,6 +3,8 @@ // MEM_Addr.i +#include "ace/Global_Macros.h" + // Default dtor. ACE_INLINE ACE_MEM_Addr::~ACE_MEM_Addr (void) diff --git a/ace/MEM_IO.i b/ace/MEM_IO.i index 796121a6c6e..3d80a0f8840 100644 --- a/ace/MEM_IO.i +++ b/ace/MEM_IO.i @@ -3,6 +3,8 @@ // MEM_IO.i +#include "ace/OS_NS_string.h" + ASYS_INLINE ACE_Reactive_MEM_IO::ACE_Reactive_MEM_IO () { diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp index 1a3224dbe76..1c35a3064a6 100644 --- a/ace/Malloc.cpp +++ b/ace/Malloc.cpp @@ -4,12 +4,14 @@ #define ACE_MALLOC_CPP #include "ace/Malloc.h" -#include "ace/Object_Manager.h" #if !defined (__ACE_INLINE__) #include "ace/Malloc.i" #endif /* __ACE_INLINE__ */ +#include "ace/Object_Manager.h" +#include "ace/OS_NS_string.h" + ACE_RCSID(ace, Malloc, "$Id$") // Process-wide ACE_Allocator. diff --git a/ace/Malloc.h b/ace/Malloc.h index a2f4eb87ee4..4e4a38e4865 100644 --- a/ace/Malloc.h +++ b/ace/Malloc.h @@ -21,7 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" #include "ace/Log_Msg.h" #if defined (ACE_HAS_MALLOC_STATS) diff --git a/ace/Malloc_Allocator.i b/ace/Malloc_Allocator.i index 752860b0d1e..e360750f9aa 100644 --- a/ace/Malloc_Allocator.i +++ b/ace/Malloc_Allocator.i @@ -1,9 +1,9 @@ /* -*- C++ -*- */ // $Id$ -#include "ace/OS.h" #include "ace/os_include/os_errno.h" #include "ace/Log_Msg.h" // for ACE_ASSERT +#include "ace/OS_NS_string.h" ACE_INLINE void * ACE_New_Allocator::calloc (size_t n_elem, size_t elem_size, char initial_value) diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp index e163c8b648e..1812aa676f0 100644 --- a/ace/Malloc_T.cpp +++ b/ace/Malloc_T.cpp @@ -15,6 +15,7 @@ #endif /* __ACE_INLINE__ */ #include "ace/ACE.h" +#include "ace/OS_NS_string.h" ACE_RCSID(ace, Malloc_T, "$Id$") diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index a1688439c8a..ef577bee87c 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -15,13 +15,12 @@ #define ACE_MALLOC_T_H #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/Malloc.h" /* Need ACE_Control_Block */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Malloc.h" /* Need ACE_Control_Block */ #include "ace/Malloc_Allocator.h" #include "ace/Free_List.h" diff --git a/ace/Manual_Event.cpp b/ace/Manual_Event.cpp index 1bfafe0b815..e6eaca44ec6 100644 --- a/ace/Manual_Event.cpp +++ b/ace/Manual_Event.cpp @@ -43,14 +43,3 @@ ACE_Manual_Event::dump (void) const #endif /* ACE_HAS_DUMP */ } -ACE_Auto_Event::ACE_Auto_Event (int initial_state, - int type, - const char *name, - void *arg) - : ACE_Event (0, - initial_state, - type, - ACE_TEXT_CHAR_TO_TCHAR (name), - arg) -{ -} diff --git a/ace/Mem_Map.cpp b/ace/Mem_Map.cpp index c0d066f3980..0d37ecbc10e 100644 --- a/ace/Mem_Map.cpp +++ b/ace/Mem_Map.cpp @@ -3,6 +3,13 @@ // Defines the member functions for the memory mapping facility. #include "ace/Mem_Map.h" +#if !defined (__ACE_INLINE__) +#include "ace/Mem_Map.i" +#endif /* __ACE_INLINE__ */ + +#include "ace/OS_NS_sys_stat.h" +#include "ace/OS_NS_fcntl.h" +#include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" #if defined (ACE_WIN32) \ @@ -14,10 +21,6 @@ #include "ace/SString.h" #endif /* ACE_USE_MAPPING_NAME */ -#if !defined (__ACE_INLINE__) -#include "ace/Mem_Map.i" -#endif /* __ACE_INLINE__ */ - ACE_RCSID(ace, Mem_Map, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_Mem_Map) diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h index c55a5836b3f..4522e2070a2 100644 --- a/ace/Mem_Map.h +++ b/ace/Mem_Map.h @@ -21,7 +21,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/Global_Macros.h" +#include "ace/os_include/sys/os_mman.h" +#include "ace/os_include/os_limits.h" +#include "ace/os_include/os_fcntl.h" +#include "ace/Default_Constants.h" /** * @class ACE_Mem_Map diff --git a/ace/Mem_Map.i b/ace/Mem_Map.i index 85495a13dd5..99d3a45cfbf 100644 --- a/ace/Mem_Map.i +++ b/ace/Mem_Map.i @@ -1,6 +1,9 @@ /* -*- C++ -*- */ // $Id$ +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_mman.h" + ACE_INLINE ACE_HANDLE ACE_Mem_Map::handle (void) const { diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp index 9a44b4277fa..963c5189249 100644 --- a/ace/Memory_Pool.cpp +++ b/ace/Memory_Pool.cpp @@ -2,14 +2,18 @@ // Memory_Pool.cpp #include "ace/Memory_Pool.h" -#include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) #include "ace/Memory_Pool.i" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" #include "ace/Auto_Ptr.h" #include "ace/RW_Thread_Mutex.h" +#include "ace/OS_NS_sys_mman.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_stat.h" +#include "ace/OS_NS_sys_shm.h" #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) #include "ace/Based_Pointer_T.h" diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp index d36f00e8935..aad8d35eee0 100644 --- a/ace/Message_Block.cpp +++ b/ace/Message_Block.cpp @@ -1,15 +1,17 @@ #include "ace/Message_Block.h" + +#if !defined (__ACE_INLINE__) +#include "ace/Message_Block.i" +#endif /* __ACE_INLINE__ */ + #include "ace/Log_Msg.h" #include "ace/Malloc_Base.h" #include "ace/Guard_T.h" +#include "ace/OS_NS_string.h" //#define ACE_ENABLE_TIMEPROBES #include "ace/Timeprobe.h" -#if !defined (__ACE_INLINE__) -#include "ace/Message_Block.i" -#endif /* __ACE_INLINE__ */ - ACE_RCSID (ace, Message_Block, "$Id$") diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp index 475aa6580fe..55616ed75a2 100644 --- a/ace/Message_Queue_T.cpp +++ b/ace/Message_Queue_T.cpp @@ -7,6 +7,7 @@ // circular include problems. #include "ace/Message_Queue.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_sys_time.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Metrics_Cache.cpp b/ace/Metrics_Cache.cpp index 6ea24ce19e0..a901fa53bb5 100644 --- a/ace/Metrics_Cache.cpp +++ b/ace/Metrics_Cache.cpp @@ -4,14 +4,12 @@ //#define ACE_BUILD_DLL -#include "ace/OS.h" +#include "ace/Metrics_Cache.h" ACE_RCSID(ace, Metrics_Cache, "Metrics_Cache.cpp,v 4.18 1998/07/11 08:53:56 gonzo Exp") #if defined (ACE_COMPILE_TIMEPROBES) -#include "ace/Metrics_Cache.h" - #if !defined (__ACE_INLINE__) #include "ace/Metrics_Cache.i" #endif /* __ACE_INLINE__ */ diff --git a/ace/Metrics_Cache_T.h b/ace/Metrics_Cache_T.h index b2685ca95a8..9f3fef943b2 100644 --- a/ace/Metrics_Cache_T.h +++ b/ace/Metrics_Cache_T.h @@ -12,7 +12,7 @@ #ifndef METRICS_CACHE_T_H #define METRICS_CACHE_T_H -#include "ace/OS.h" +#include "ace/config-all.h" // helpful macro definitions #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/ace/Module.h b/ace/Module.h index 1490da2095c..7efe337bef5 100644 --- a/ace/Module.h +++ b/ace/Module.h @@ -22,6 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Task_T.h" +#include "ace/os_include/os_dirent.h" /** * @class ACE_Module_Base diff --git a/ace/Mutex.cpp b/ace/Mutex.cpp index 597509e37f0..a4085942583 100644 --- a/ace/Mutex.cpp +++ b/ace/Mutex.cpp @@ -6,7 +6,8 @@ #include "ace/Mutex.inl" #endif /* __ACE_INLINE__ */ -//#include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/os_include/sys/os_mman.h" ACE_RCSID(ace, Mutex, "$Id$") diff --git a/ace/Mutex.h b/ace/Mutex.h index 1ba1a35f6ba..67545cc10d7 100644 --- a/ace/Mutex.h +++ b/ace/Mutex.h @@ -22,7 +22,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_Thread.h" +#include "ace/OS_NS_unistd.h" +#include "ace/os_include/os_fcntl.h" # if !defined (ACE_DEFAULT_MUTEX_A) # define ACE_DEFAULT_MUTEX_A "ACE_MUTEX" diff --git a/ace/Mutex.inl b/ace/Mutex.inl index 33022dd651e..08b6ee9d33d 100644 --- a/ace/Mutex.inl +++ b/ace/Mutex.inl @@ -1,6 +1,8 @@ /* -*- C++ -*- */ // $Id$ +#include "ace/OS_NS_sys_mman.h" + ACE_INLINE int ACE_Mutex::acquire_read (void) { diff --git a/ace/Name_Request_Reply.cpp b/ace/Name_Request_Reply.cpp index 509b8f806d0..de76953a384 100644 --- a/ace/Name_Request_Reply.cpp +++ b/ace/Name_Request_Reply.cpp @@ -1,7 +1,8 @@ #include "ace/Name_Request_Reply.h" #include "ace/Log_Msg.h" #include "ace/Time_Value.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" +#include "ace/os_include/arpa/os_inet.h" ACE_RCSID (ace, Name_Request_Reply, diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp index feb671f6322..3a8dae76c1b 100644 --- a/ace/Naming_Context.cpp +++ b/ace/Naming_Context.cpp @@ -45,11 +45,11 @@ ACE_Naming_Context::info (ACE_TCHAR **strp, ACE_LIB_TEXT ("ACE_Naming_Context"), ACE_LIB_TEXT ("Proxy for making calls to a Name Server")); - if (*strp == 0 && (*strp = ACE_OS_String::strdup (buf)) == 0) + if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) return -1; else - ACE_OS_String::strsncpy (*strp, buf, length); - return ACE_static_cast (int, ACE_OS_String::strlen (buf)); + ACE_OS::strsncpy (*strp, buf, length); + return ACE_static_cast (int, ACE_OS::strlen (buf)); } int diff --git a/ace/OS.cpp b/ace/OS.cpp index 6ec74ee26c5..579a6617192 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -1,8 +1,8 @@ // $Id$ #include "ace/OS.h" -#include "ace/Sched_Params.h" -#include "ace/OS_Thread_Adapter.h" +//#include "ace/Sched_Params.h" +//#include "ace/OS_Thread_Adapter.h" #if !defined (ACE_HAS_WINCE) # include "ace/OS_QoS.h" @@ -155,7 +155,7 @@ add_to_argv (int& argc, char** argv, int max_args, char* string) { char indouble = 0; size_t previous = 0; - size_t length = ACE_OS_String::strlen (string); + size_t length = ACE_OS::strlen (string); // We use <= to make sure that we get the last argument for (size_t i = 0; i <= length; i++) @@ -181,7 +181,7 @@ add_to_argv (int& argc, char** argv, int max_args, char* string) { // The next character is automatically // skipped because of the strcpy - ACE_OS_String::strcpy (string + i, string + i + 1); + ACE_OS::strcpy (string + i, string + i + 1); length--; } else if (!indouble && @@ -23,6 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if 0 #include "ace/Cleanup.h" #include "ace/Object_Manager_Base.h" #include "ace/OS_main.h" @@ -406,5 +407,7 @@ namespace ACE_OS # include "ace/Thread_Control.h" #endif /* ACE_LEGACY_MODE */ +#endif /* 0 */ + #include /**/ "ace/post.h" #endif /* ACE_OS_H */ diff --git a/ace/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp index 3521af1323c..8d8ab19026d 100644 --- a/ace/OS_NS_Thread.cpp +++ b/ace/OS_NS_Thread.cpp @@ -13,6 +13,7 @@ ACE_RCSID(ace, OS_NS_Thread, "$Id$") #include "ace/Sched_Params.h" #include "ace/OS_Memory.h" #include "ace/OS_Thread_Adapter.h" +#include "ace/Min_Max.h" // This is necessary to work around nasty problems with MVS C++. diff --git a/ace/OS_NS_Thread.inl b/ace/OS_NS_Thread.inl index 45f7b66e81f..73bb51eeeaf 100644 --- a/ace/OS_NS_Thread.inl +++ b/ace/OS_NS_Thread.inl @@ -4518,14 +4518,14 @@ ACE_OS::thread_mutex_unlock (ACE_thread_mutex_t *m) //# define ACE_SPECIAL_INLINE inline # endif -ACE_SPECIAL_INLINE +ACE_INLINE int ACE_OS_Thread_Mutex_Guard::acquire (void) { return owner_ = ACE_OS::thread_mutex_lock (&lock_); } -ACE_SPECIAL_INLINE +ACE_INLINE int ACE_OS_Thread_Mutex_Guard::release (void) { @@ -4538,13 +4538,14 @@ ACE_OS_Thread_Mutex_Guard::release (void) } } -ACE_SPECIAL_INLINE +ACE_INLINE ACE_OS_Thread_Mutex_Guard::ACE_OS_Thread_Mutex_Guard (ACE_thread_mutex_t &m) : lock_ (m) { acquire (); } +ACE_INLINE ACE_OS_Thread_Mutex_Guard::~ACE_OS_Thread_Mutex_Guard () { release (); @@ -4552,14 +4553,14 @@ ACE_OS_Thread_Mutex_Guard::~ACE_OS_Thread_Mutex_Guard () /*****************************************************************************/ -ACE_SPECIAL_INLINE +ACE_INLINE int ACE_OS_Recursive_Thread_Mutex_Guard::acquire (void) { return owner_ = ACE_OS::recursive_mutex_lock (&lock_); } -ACE_SPECIAL_INLINE +ACE_INLINE int ACE_OS_Recursive_Thread_Mutex_Guard::release (void) { @@ -4572,7 +4573,7 @@ ACE_OS_Recursive_Thread_Mutex_Guard::release (void) } } -ACE_SPECIAL_INLINE +ACE_INLINE ACE_OS_Recursive_Thread_Mutex_Guard::ACE_OS_Recursive_Thread_Mutex_Guard ( ACE_recursive_thread_mutex_t &m) : lock_ (m), @@ -4581,6 +4582,7 @@ ACE_OS_Recursive_Thread_Mutex_Guard::ACE_OS_Recursive_Thread_Mutex_Guard ( acquire (); } +ACE_INLINE ACE_OS_Recursive_Thread_Mutex_Guard::~ACE_OS_Recursive_Thread_Mutex_Guard () { release (); diff --git a/ace/OS_NS_ctype.h b/ace/OS_NS_ctype.h index b3e97796c1d..11740b2ccf1 100644 --- a/ace/OS_NS_ctype.h +++ b/ace/OS_NS_ctype.h @@ -25,8 +25,6 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/os_include/os_ctype.h" - namespace ACE_OS { // these are non-standard names... diff --git a/ace/OS_NS_ctype.inl b/ace/OS_NS_ctype.inl index 174c33ef4df..dfea0ad8640 100644 --- a/ace/OS_NS_ctype.inl +++ b/ace/OS_NS_ctype.inl @@ -1,6 +1,8 @@ // -*- C++ -*- // $Id$ +#include "ace/os_include/os_ctype.h" + ACE_INLINE int ACE_OS::ace_isprint (const ACE_TCHAR c) { diff --git a/ace/OS_NS_math.h b/ace/OS_NS_math.h index fc6a8081e9f..350f6ebd046 100644 --- a/ace/OS_NS_math.h +++ b/ace/OS_NS_math.h @@ -25,8 +25,6 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/os_include/os_math.h" - namespace ACE_OS { /// This method computes the largest integral value not greater than x. diff --git a/ace/OS_NS_netdb.inl b/ace/OS_NS_netdb.inl index 983fe7df7d6..62ca9c182bc 100644 --- a/ace/OS_NS_netdb.inl +++ b/ace/OS_NS_netdb.inl @@ -96,7 +96,7 @@ ACE_OS::gethostbyaddr_r (const char *addr, } # elif defined (__GLIBC__) // GNU C library has a different signature - ::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); + ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); if (::gethostbyaddr_r ((char *) addr, length, @@ -198,7 +198,7 @@ ACE_OS::gethostbyname_r (const char *name, } # elif defined (__GLIBC__) // GNU C library has a different signature - ::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); + ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); if (::gethostbyname_r (name, result, @@ -486,7 +486,7 @@ ACE_OS::getservbyname_r (const char *svc, return (struct servent *) 0; # elif defined (__GLIBC__) // GNU C library has a different signature - ::memset (buf, 0, sizeof (ACE_SERVENT_DATA)); + ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA)); if (::getservbyname_r (svc, proto, diff --git a/ace/OS_NS_regex.h b/ace/OS_NS_regex.h index a09240f9375..f49ed62d58f 100644 --- a/ace/OS_NS_regex.h +++ b/ace/OS_NS_regex.h @@ -25,8 +25,6 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/os_include/os_regex.h" - namespace ACE_OS { // non=standard.. diff --git a/ace/OS_NS_regex.inl b/ace/OS_NS_regex.inl index 5a97d80c955..b1f445f0e67 100644 --- a/ace/OS_NS_regex.inl +++ b/ace/OS_NS_regex.inl @@ -2,6 +2,7 @@ // $Id$ #include "ace/OS_NS_errno.h" +#include "ace/os_include/os_regex.h" ACE_INLINE char * ACE_OS::compile (const char *instring, char *expbuf, char *endbuf) diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl index 233c1f8778b..d43b115600d 100644 --- a/ace/OS_NS_stdio.inl +++ b/ace/OS_NS_stdio.inl @@ -8,6 +8,13 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_pwd.h" +#if defined (ACE_HAS_CHARPTR_SPRINTF) +# define ACE_SPRINTF_ADAPTER(X) ACE_OS::strlen (X) +#else +# define ACE_SPRINTF_ADAPTER(X) X +#endif /* ACE_HAS_CHARPTR_SPRINTF */ + + #if defined (ACE_PSOS) ACE_INLINE int isatty (int h) diff --git a/ace/OS_NS_stdlib.cpp b/ace/OS_NS_stdlib.cpp index 09aafb817f2..339c277a693 100644 --- a/ace/OS_NS_stdlib.cpp +++ b/ace/OS_NS_stdlib.cpp @@ -9,6 +9,8 @@ ACE_RCSID(ace, OS_NS_stdlib, "$Id$") # include "ace/OS_NS_stdlib.inl" #endif /* ACE_HAS_INLINED_OS_CALLS */ +#include "ace/OS_Memory.h" + ACE_EXIT_HOOK ACE_OS::exit_hook_ = 0; void * diff --git a/ace/OS_NS_stdlib.inl b/ace/OS_NS_stdlib.inl index c22b3723fc1..4e5c9e3d123 100644 --- a/ace/OS_NS_stdlib.inl +++ b/ace/OS_NS_stdlib.inl @@ -1,7 +1,9 @@ // -*- C++ -*- // $Id$ -#include "ace/Object_Manager.h" +#include "ace/Object_Manager_Base.h" +#include "ace/OS_NS_string.h" +#include "ace/Global_Macros.h" // Doesn't need a macro since it *never* returns! diff --git a/ace/OS_NS_string.h b/ace/OS_NS_string.h index 0de70d023fe..0af4da7c91b 100644 --- a/ace/OS_NS_string.h +++ b/ace/OS_NS_string.h @@ -25,7 +25,6 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/os_include/os_string.h" #include "ace/Basic_Types.h" // to get ACE_WCHAR_T, // should be in os_stddef.h or not used like this. diff --git a/ace/OS_NS_stropts.cpp b/ace/OS_NS_stropts.cpp index 91682f7ebec..72696cb7b72 100644 --- a/ace/OS_NS_stropts.cpp +++ b/ace/OS_NS_stropts.cpp @@ -11,12 +11,12 @@ ACE_RCSID(ace, OS_NS_stropts, "$Id$") int ACE_OS::ioctl (ACE_HANDLE socket, - u_long io_control_code, + unsigned long io_control_code, void *in_buffer_p, - u_long in_buffer, + unsigned long in_buffer, void *out_buffer_p, - u_long out_buffer, - u_long *bytes_returned, + unsigned long out_buffer, + unsigned long *bytes_returned, ACE_OVERLAPPED *overlapped, ACE_OVERLAPPED_COMPLETION_FUNC func) { @@ -49,18 +49,18 @@ ACE_OS::ioctl (ACE_HANDLE socket, int ACE_OS::ioctl (ACE_HANDLE socket, - u_long io_control_code, + unsigned long io_control_code, ACE_QoS &ace_qos, - u_long *bytes_returned, + unsigned long *bytes_returned, void *buffer_p, - u_long buffer, + unsigned long buffer, ACE_OVERLAPPED *overlapped, ACE_OVERLAPPED_COMPLETION_FUNC func) { # if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) QOS qos; - u_long qos_len = sizeof (QOS); + unsigned long qos_len = sizeof (QOS); if (io_control_code == SIO_SET_QOS) { @@ -84,7 +84,7 @@ ACE_OS::ioctl (ACE_HANDLE socket, } else { - u_long dwBufferLen = 0; + unsigned long dwBufferLen = 0; // Query for the buffer size. int result = ::WSAIoctl ((ACE_SOCKET) socket, @@ -100,7 +100,7 @@ ACE_OS::ioctl (ACE_HANDLE socket, if (result == SOCKET_ERROR) { - u_long dwErr = ::WSAGetLastError (); + unsigned long dwErr = ::WSAGetLastError (); if (dwErr == WSAEWOULDBLOCK) { diff --git a/ace/OS_NS_stropts.h b/ace/OS_NS_stropts.h index c37dd25d13c..4660a2ff1f9 100644 --- a/ace/OS_NS_stropts.h +++ b/ace/OS_NS_stropts.h @@ -39,7 +39,7 @@ typedef GROUP ACE_SOCK_GROUP; #else /* (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */ struct ACE_Protocol_Info { - u_long dwServiceFlags1; + unsigned long dwServiceFlags1; int iAddressFamily; int iProtocol; char szProtocol[255+1]; @@ -47,11 +47,11 @@ struct ACE_Protocol_Info // Callback function that's used by the QoS-enabled <ACE_OS::ioctl> // method. -typedef void (*ACE_OVERLAPPED_COMPLETION_FUNC) (u_long error, - u_long bytes_transferred, +typedef void (*ACE_OVERLAPPED_COMPLETION_FUNC) (unsigned long error, + unsigned long bytes_transferred, ACE_OVERLAPPED *overlapped, - u_long flags); -typedef u_long ACE_SOCK_GROUP; + unsigned long flags); +typedef unsigned long ACE_SOCK_GROUP; #endif /* (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */ @@ -99,23 +99,23 @@ namespace ACE_OS { #if !defined (ACE_HAS_WINCE) /// QoS-enabled <ioctl>. int ioctl (ACE_HANDLE socket, - u_long io_control_code, + unsigned long io_control_code, void *in_buffer_p, - u_long in_buffer, + unsigned long in_buffer, void *out_buffer_p, - u_long out_buffer, - u_long *bytes_returned, + unsigned long out_buffer, + unsigned long *bytes_returned, ACE_OVERLAPPED *overlapped, ACE_OVERLAPPED_COMPLETION_FUNC func); /// QoS-enabled <ioctl> when the I/O control code is either /// SIO_SET_QOS or SIO_GET_QOS. int ioctl (ACE_HANDLE socket, - u_long io_control_code, + unsigned long io_control_code, ACE_QoS &ace_qos, - u_long *bytes_returned, + unsigned long *bytes_returned, void *buffer_p = 0, - u_long buffer = 0, + unsigned long buffer = 0, ACE_OVERLAPPED *overlapped = 0, ACE_OVERLAPPED_COMPLETION_FUNC func = 0); #endif // ACE_HAS_WINCE diff --git a/ace/OS_NS_stropts.inl b/ace/OS_NS_stropts.inl index ef8558f67de..8925801d6ba 100644 --- a/ace/OS_NS_stropts.inl +++ b/ace/OS_NS_stropts.inl @@ -108,7 +108,7 @@ ACE_OS::ioctl (ACE_HANDLE handle, #if defined (ACE_WIN32) ACE_SOCKET sock = (ACE_SOCKET) handle; - ACE_SOCKCALL_RETURN (::ioctlsocket (sock, cmd, (u_long *) val), int, -1); + ACE_SOCKCALL_RETURN (::ioctlsocket (sock, cmd, (unsigned long *) val), int, -1); #elif defined (VXWORKS) ACE_OSCALL_RETURN (::ioctl (handle, cmd, ACE_reinterpret_cast (int, val)), int, -1); diff --git a/ace/OS_NS_sys_mman.h b/ace/OS_NS_sys_mman.h index 9f883789a0c..f9bcb7e353b 100644 --- a/ace/OS_NS_sys_mman.h +++ b/ace/OS_NS_sys_mman.h @@ -25,8 +25,8 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/os_include/sys/os_mman.h" #include "ace/Global_Macros.h" +#include "ace/os_include/sys/os_types.h" namespace ACE_OS { diff --git a/ace/OS_NS_sys_mman.inl b/ace/OS_NS_sys_mman.inl index 612bac0162d..dd93e204e5f 100644 --- a/ace/OS_NS_sys_mman.inl +++ b/ace/OS_NS_sys_mman.inl @@ -3,6 +3,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" +#include "ace/os_include/sys/os_mman.h" #if defined (ACE_HAS_VOIDPTR_MMAP) // Needed for some odd OS's (e.g., SGI). diff --git a/ace/OS_NS_sys_stat.h b/ace/OS_NS_sys_stat.h index b9df56eee1d..cf2e0a339f1 100644 --- a/ace/OS_NS_sys_stat.h +++ b/ace/OS_NS_sys_stat.h @@ -25,7 +25,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/os_include/sys/os_stat.h" +#include "ace/os_include/sys/os_types.h" #include "ace/Default_Constants.h" // for ACE_DEFAULT_DIR_PERMS # if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__) diff --git a/ace/OS_NS_sys_utsname.cpp b/ace/OS_NS_sys_utsname.cpp index a7ff514d951..726ac714e30 100644 --- a/ace/OS_NS_sys_utsname.cpp +++ b/ace/OS_NS_sys_utsname.cpp @@ -124,14 +124,14 @@ ACE_OS::uname (ACE_utsname *name) break; # if defined PROCESSOR_ARCHITECTURE_IA64 case PROCESSOR_ARCHITECTURE_IA64: - ACE_OS_String::strcpy (processor, ACE_LIB_TEXT ("Itanium")); + ACE_OS::strcpy (processor, ACE_LIB_TEXT ("Itanium")); ACE_OS::sprintf (subtype, ACE_LIB_TEXT ("%d"), sinfo.wProcessorLevel); break; # endif # if defined PROCESSOR_ARCHITECTURE_ARM case PROCESSOR_ARCHITECTURE_ARM: - ACE_OS_String::strcpy (processor, ACE_LIB_TEXT ("ARM")); + ACE_OS::strcpy (processor, ACE_LIB_TEXT ("ARM")); ACE_OS::sprintf (subtype, ACE_LIB_TEXT ("%d"), sinfo.wProcessorLevel); break; diff --git a/ace/OS_QoS.cpp b/ace/OS_QoS.cpp index b1985171661..8240231b9c5 100644 --- a/ace/OS_QoS.cpp +++ b/ace/OS_QoS.cpp @@ -11,15 +11,16 @@ //============================================================================= #include "ace/OS_QoS.h" +#include "ace/OS_NS_errno.h" -ACE_Flow_Spec::ACE_Flow_Spec (u_long token_rate, - u_long token_bucket_size, - u_long peak_bandwidth, - u_long latency, - u_long delay_variation, +ACE_Flow_Spec::ACE_Flow_Spec (unsigned long token_rate, + unsigned long token_bucket_size, + unsigned long peak_bandwidth, + unsigned long latency, + unsigned long delay_variation, ACE_SERVICE_TYPE service_type, - u_long max_sdu_size, - u_long minimum_policed_size, + unsigned long max_sdu_size, + unsigned long minimum_policed_size, int ttl, int priority) { @@ -86,7 +87,7 @@ ACE_Flow_Spec::ACE_Flow_Spec (void) #endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */ } -u_long +unsigned long ACE_Flow_Spec::token_rate (void) const { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) @@ -97,7 +98,7 @@ ACE_Flow_Spec::token_rate (void) const } void -ACE_Flow_Spec::token_rate (u_long tr) +ACE_Flow_Spec::token_rate (unsigned long tr) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) this->TokenRate = tr; @@ -106,7 +107,7 @@ ACE_Flow_Spec::token_rate (u_long tr) #endif /* ACE_HAS_WINSOCK2 */ } -u_long +unsigned long ACE_Flow_Spec::token_bucket_size (void) const { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) @@ -117,7 +118,7 @@ ACE_Flow_Spec::token_bucket_size (void) const } void -ACE_Flow_Spec::token_bucket_size (u_long tbs) +ACE_Flow_Spec::token_bucket_size (unsigned long tbs) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) this->TokenBucketSize = tbs; @@ -126,7 +127,7 @@ ACE_Flow_Spec::token_bucket_size (u_long tbs) #endif /* ACE_HAS_WINSOCK2 */ } -u_long +unsigned long ACE_Flow_Spec::peak_bandwidth (void) const { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) @@ -137,7 +138,7 @@ ACE_Flow_Spec::peak_bandwidth (void) const } void -ACE_Flow_Spec::peak_bandwidth (u_long pb) +ACE_Flow_Spec::peak_bandwidth (unsigned long pb) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) this->PeakBandwidth = pb; @@ -146,7 +147,7 @@ ACE_Flow_Spec::peak_bandwidth (u_long pb) #endif /* ACE_HAS_WINSOCK2 */ } -u_long +unsigned long ACE_Flow_Spec::latency (void) const { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) @@ -157,7 +158,7 @@ ACE_Flow_Spec::latency (void) const } void -ACE_Flow_Spec::latency (u_long l) +ACE_Flow_Spec::latency (unsigned long l) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) this->Latency = l; @@ -166,7 +167,7 @@ ACE_Flow_Spec::latency (u_long l) #endif /* ACE_HAS_WINSOCK2 */ } -u_long +unsigned long ACE_Flow_Spec::delay_variation (void) const { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) @@ -176,7 +177,7 @@ ACE_Flow_Spec::delay_variation (void) const #endif /* ACE_HAS_WINSOCK2 */ } void -ACE_Flow_Spec::delay_variation (u_long dv) +ACE_Flow_Spec::delay_variation (unsigned long dv) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) this->DelayVariation = dv; @@ -207,7 +208,7 @@ ACE_Flow_Spec::service_type (ACE_SERVICE_TYPE st) #endif /* ACE_HAS_WINSOCK2 */ } -u_long +unsigned long ACE_Flow_Spec::max_sdu_size (void) const { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ @@ -219,7 +220,7 @@ ACE_Flow_Spec::max_sdu_size (void) const } void -ACE_Flow_Spec::max_sdu_size (u_long mss) +ACE_Flow_Spec::max_sdu_size (unsigned long mss) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ defined (ACE_HAS_WINSOCK2_GQOS) @@ -229,7 +230,7 @@ ACE_Flow_Spec::max_sdu_size (u_long mss) #endif /* ACE_HAS_WINSOCK2 */ } -u_long +unsigned long ACE_Flow_Spec::minimum_policed_size (void) const { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ @@ -241,7 +242,7 @@ ACE_Flow_Spec::minimum_policed_size (void) const } void -ACE_Flow_Spec::minimum_policed_size (u_long mps) +ACE_Flow_Spec::minimum_policed_size (unsigned long mps) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ defined (ACE_HAS_WINSOCK2_GQOS) @@ -370,7 +371,7 @@ ACE_QoS_Params::ACE_QoS_Params (iovec *caller_data, iovec *callee_data, ACE_QoS *socket_qos, ACE_QoS *group_socket_qos, - u_long flags) + unsigned long flags) : caller_data_ (caller_data), callee_data_ (callee_data), socket_qos_ (socket_qos), @@ -427,20 +428,20 @@ ACE_QoS_Params::group_socket_qos (ACE_QoS *gsq) this->group_socket_qos_ = gsq; } -u_long +unsigned long ACE_QoS_Params::flags (void) const { return this->flags_; } void -ACE_QoS_Params::flags (u_long f) +ACE_QoS_Params::flags (unsigned long f) { this->flags_ = f; } ACE_Accept_QoS_Params::ACE_Accept_QoS_Params (ACE_QOS_CONDITION_FUNC qos_condition_callback, - u_long callback_data) + unsigned long callback_data) : qos_condition_callback_ (qos_condition_callback), callback_data_ (callback_data) { @@ -458,14 +459,14 @@ ACE_Accept_QoS_Params::qos_condition_callback (ACE_QOS_CONDITION_FUNC qcc) this->qos_condition_callback_ = qcc; } -u_long +unsigned long ACE_Accept_QoS_Params::callback_data (void) const { return this->callback_data_; } void -ACE_Accept_QoS_Params::callback_data (u_long cd) +ACE_Accept_QoS_Params::callback_data (unsigned long cd) { this->callback_data_ = cd; } diff --git a/ace/OS_QoS.h b/ace/OS_QoS.h index 3756f4cf016..68e8705f51f 100644 --- a/ace/OS_QoS.h +++ b/ace/OS_QoS.h @@ -16,17 +16,20 @@ #define ACE_OS_QOS_H #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/OS_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/os_include/sys/os_uio.h" +#include "ace/OS_NS_stropts.h" + #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) #if defined (ACE_HAS_WINSOCK2_GQOS) typedef SERVICETYPE ACE_SERVICE_TYPE; #else -typedef u_long ACE_SERVICE_TYPE; +typedef unsigned long ACE_SERVICE_TYPE; #endif /* ACE_HAS_WINSOCK2_GQOS */ @@ -57,7 +60,7 @@ typedef u_long ACE_SERVICE_TYPE; #define ACE_SIO_SET_QOS SIO_SET_QOS #else -typedef u_long ACE_SERVICE_TYPE; +typedef unsigned long ACE_SERVICE_TYPE; #define ACE_OVERLAPPED_SOCKET_FLAG 0 #define ACE_XP1_QOS_SUPPORTED 0x00002000 @@ -108,46 +111,46 @@ public: ACE_Flow_Spec (void); /// Constructor that initializes all the fields. - ACE_Flow_Spec (u_long token_rate, - u_long token_bucket_size, - u_long peak_bandwidth, - u_long latency, - u_long delay_variation, + ACE_Flow_Spec (unsigned long token_rate, + unsigned long token_bucket_size, + unsigned long peak_bandwidth, + unsigned long latency, + unsigned long delay_variation, ACE_SERVICE_TYPE service_type, - u_long max_sdu_size, - u_long minimum_policed_size, + unsigned long max_sdu_size, + unsigned long minimum_policed_size, int ttl, int priority); /// Get the token rate in bytes/sec. - u_long token_rate (void) const; + unsigned long token_rate (void) const; /// Set the token rate in bytes/sec. - void token_rate (u_long tr); + void token_rate (unsigned long tr); /// Get the token bucket size in bytes. - u_long token_bucket_size (void) const; + unsigned long token_bucket_size (void) const; /// Set the token bucket size in bytes. - void token_bucket_size (u_long tbs); + void token_bucket_size (unsigned long tbs); /// Get the PeakBandwidth in bytes/sec. - u_long peak_bandwidth (void) const; + unsigned long peak_bandwidth (void) const; /// Set the PeakBandwidth in bytes/sec. - void peak_bandwidth (u_long pb); + void peak_bandwidth (unsigned long pb); /// Get the latency in microseconds. - u_long latency (void) const; + unsigned long latency (void) const; /// Set the latency in microseconds. - void latency (u_long l); + void latency (unsigned long l); /// Get the delay variation in microseconds. - u_long delay_variation (void) const; + unsigned long delay_variation (void) const; /// Set the delay variation in microseconds. - void delay_variation (u_long dv); + void delay_variation (unsigned long dv); /// Get the service type. ACE_SERVICE_TYPE service_type (void) const; @@ -156,16 +159,16 @@ public: void service_type (ACE_SERVICE_TYPE st); /// Get the maximum SDU size in bytes. - u_long max_sdu_size (void) const; + unsigned long max_sdu_size (void) const; /// Set the maximum SDU size in bytes. - void max_sdu_size (u_long mss); + void max_sdu_size (unsigned long mss); /// Get the minimum policed size in bytes. - u_long minimum_policed_size (void) const; + unsigned long minimum_policed_size (void) const; /// Set the minimum policed size in bytes. - void minimum_policed_size (u_long mps); + void minimum_policed_size (unsigned long mps); /// Get the time-to-live. int ttl (void) const; @@ -183,14 +186,14 @@ public: defined (ACE_HAS_WINSOCK2_GQOS) #else private: - u_long token_rate_; - u_long token_bucket_size_; - u_long peak_bandwidth_; - u_long latency_; - u_long delay_variation_; + unsigned long token_rate_; + unsigned long token_bucket_size_; + unsigned long peak_bandwidth_; + unsigned long latency_; + unsigned long delay_variation_; ACE_SERVICE_TYPE service_type_; - u_long max_sdu_size_; - u_long minimum_policed_size_; + unsigned long max_sdu_size_; + unsigned long minimum_policed_size_; int ttl_; int priority_; #endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \ @@ -264,7 +267,7 @@ public: iovec *callee_data = 0, ACE_QoS *socket_qos = 0, ACE_QoS *group_socket_qos = 0, - u_long flags = 0); + unsigned long flags = 0); /// Get caller data. iovec *caller_data (void) const; @@ -291,10 +294,10 @@ public: void group_socket_qos (ACE_QoS *); /// Get flags. - u_long flags (void) const; + unsigned long flags (void) const; /// Set flags. - void flags (u_long); + void flags (unsigned long); private: /// A pointer to the user data that is to be transferred to the peer @@ -314,7 +317,7 @@ private: ACE_QoS *group_socket_qos_; /// Flags that indicate if we're a sender, receiver, or both. - u_long flags_; + unsigned long flags_; }; // Callback function that's used by the QoS-enabled <ACE_OS::accept> @@ -326,7 +329,7 @@ typedef int (*ACE_QOS_CONDITION_FUNC) (iovec *caller_id, iovec *callee_id, iovec *callee_data, ACE_SOCK_GROUP *g, - u_long callbackdata); + unsigned long callbackdata); /** @@ -349,7 +352,7 @@ public: * i.e., it is an Asynchronous Completion Token (ACT). */ ACE_Accept_QoS_Params (ACE_QOS_CONDITION_FUNC qos_condition_callback = 0, - u_long callback_data = 0); + unsigned long callback_data = 0); /// Get QoS condition callback. ACE_QOS_CONDITION_FUNC qos_condition_callback (void) const; @@ -358,10 +361,10 @@ public: void qos_condition_callback (ACE_QOS_CONDITION_FUNC qcc); /// Get callback data. - u_long callback_data (void) const; + unsigned long callback_data (void) const; /// Set callback data. - void callback_data (u_long cd); + void callback_data (unsigned long cd); private: /** @@ -378,7 +381,7 @@ private: * function parameter, i.e., it is an Asynchronous Completion Token * (ACT). */ - u_long callback_data_; + unsigned long callback_data_; }; diff --git a/ace/OS_Thread_Adapter.cpp b/ace/OS_Thread_Adapter.cpp index 0e59ad0926b..afe2a31850b 100644 --- a/ace/OS_Thread_Adapter.cpp +++ b/ace/OS_Thread_Adapter.cpp @@ -1,8 +1,6 @@ // $Id$ #include "ace/OS_Thread_Adapter.h" -#include "ace/Thread_Hook.h" -#include "ace/OS.h" ACE_RCSID (ace, OS_Thread_Adapter, @@ -12,6 +10,10 @@ ACE_RCSID (ace, # include "ace/OS_Thread_Adapter.inl" #endif /* ACE_HAS_INLINED_OS_CALLS */ +#include "ace/Thread_Hook.h" +#include "ace/Object_Manager_Base.h" +#include "ace/Global_Macros.h" + ACE_OS_Thread_Adapter::ACE_OS_Thread_Adapter ( ACE_THR_FUNC user_func , void *arg diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index e7f36753159..0e3b75aade7 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -16,8 +16,8 @@ #define ACE_OBJECT_MANAGER_H #include /**/ "ace/pre.h" -#include "ace/config-all.h" -#include "ace/OS.h" +#include "ace/ACE_export.h" +#include "ace/Object_Manager_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -36,8 +36,6 @@ class ACE_Sig_Set; // This is included because Svc_conf_l.cpp needs it and I don't want to // have to change it right now. :-( - // The worst thing about this, is that it still includes OS.h, but since we - // have to include it above anyway, it doesn't make a difference right now. // dhinton. #include "ace/Recursive_Thread_Mutex.h" #endif /* ACE_MT_SAFE */ diff --git a/ace/Object_Manager_Base.h b/ace/Object_Manager_Base.h index 0ebf39628d3..a1d1d18f498 100644 --- a/ace/Object_Manager_Base.h +++ b/ace/Object_Manager_Base.h @@ -26,10 +26,27 @@ #include "ace/OS_Export.h" #include "ace/Cleanup.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" +#include "ace/os_include/sys/os_types.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; diff --git a/ace/PI_Malloc.cpp b/ace/PI_Malloc.cpp index 2c8b503cd99..46c3767c73e 100644 --- a/ace/PI_Malloc.cpp +++ b/ace/PI_Malloc.cpp @@ -9,14 +9,14 @@ ACE_RCSID (ace, #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#include "ace/Object_Manager.h" -#include "ace/Process_Mutex.h" - #if !defined (__ACE_INLINE__) #include "ace/PI_Malloc.i" #endif /* __ACE_INLINE__ */ +#include "ace/Object_Manager.h" +#include "ace/Process_Mutex.h" #include "ace/Synch_T.h" +#include "ace/OS_NS_string.h" void ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp index d1d153e5baa..af4bd925c68 100644 --- a/ace/POSIX_Asynch_IO.cpp +++ b/ace/POSIX_Asynch_IO.cpp @@ -2,16 +2,16 @@ #if defined (ACE_HAS_AIO_CALLS) +#if !defined (__ACE_INLINE__) +#include "ace/POSIX_Asynch_IO.i" +#endif /* __ACE_INLINE__ */ + #include "ace/Proactor.h" #include "ace/Message_Block.h" #include "ace/INET_Addr.h" #include "ace/Asynch_Pseudo_Task.h" #include "ace/POSIX_Proactor.h" - -#if !defined (__ACE_INLINE__) -#include "ace/POSIX_Asynch_IO.i" -#endif /* __ACE_INLINE__ */ - +#include "ace/OS_NS_sys_socket.h" ACE_RCSID (ace, POSIX_Asynch_IO, diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h index 1ea2bb6e48b..aa985cdbacd 100644 --- a/ace/POSIX_Asynch_IO.h +++ b/ace/POSIX_Asynch_IO.h @@ -28,7 +28,7 @@ #if defined (ACE_HAS_AIO_CALLS) -#include "ace/OS.h" +#include "ace/os_include/os_aio.h" #include "ace/Asynch_IO_Impl.h" #include "ace/Unbounded_Queue.h" diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp index b28b38a0430..f577cf5b716 100644 --- a/ace/POSIX_Proactor.cpp +++ b/ace/POSIX_Proactor.cpp @@ -5,11 +5,6 @@ #if defined (ACE_HAS_AIO_CALLS) -#include "ace/ACE.h" -#include "ace/Task_T.h" -#include "ace/Log_Msg.h" -#include "ace/Object_Manager.h" - #if !defined (__ACE_INLINE__) #include "ace/POSIX_Proactor.i" #endif /* __ACE_INLINE__ */ @@ -18,6 +13,17 @@ # include /**/ <sys/systeminfo.h> # endif /* ACE_HAS_SYS_INFO */ +#include "ace/ACE.h" +#include "ace/Task_T.h" +#include "ace/Log_Msg.h" +#include "ace/Object_Manager.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/OS_NS_signal.h" + +#if defined (sun) +# include "ace/OS_NS_strings.h" +#endif /* sun */ + // ********************************************************************* /** * @class ACE_POSIX_Wakeup_Completion @@ -61,11 +67,11 @@ ACE_POSIX_Proactor::ACE_POSIX_Proactor (void) ACE_OS::sysinfo (SI_RELEASE , Buf, sizeof(Buf)-1); - if (ACE_OS_String::strcasecmp (Buf , "5.6") == 0) + if (ACE_OS::strcasecmp (Buf , "5.6") == 0) os_id_ = OS_SUN_56; - else if (ACE_OS_String::strcasecmp (Buf , "5.7") == 0) + else if (ACE_OS::strcasecmp (Buf , "5.7") == 0) os_id_ = OS_SUN_57; - else if (ACE_OS_String::strcasecmp (Buf , "5.8") == 0) + else if (ACE_OS::strcasecmp (Buf , "5.8") == 0) os_id_ = OS_SUN_58; #elif defined(HPUX) diff --git a/ace/Pipe.h b/ace/Pipe.h index f8f11d47063..7273e39a271 100644 --- a/ace/Pipe.h +++ b/ace/Pipe.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" - /** * @class ACE_Pipe * diff --git a/ace/Pipe.i b/ace/Pipe.i index 0eb87370827..35074670827 100644 --- a/ace/Pipe.i +++ b/ace/Pipe.i @@ -3,6 +3,8 @@ // Pipe.i +#include "ace/Global_Macros.h" + ASYS_INLINE ACE_Pipe::~ACE_Pipe (void) { diff --git a/ace/Proactor.h b/ace/Proactor.h index 72db9ff4e9f..f4dff770e54 100644 --- a/ace/Proactor.h +++ b/ace/Proactor.h @@ -20,7 +20,6 @@ #include "ace/config-all.h" #include "ace/ACE_export.h" -#include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/ace/Proactor_Impl.h b/ace/Proactor_Impl.h index 39d90f9e945..ae41266d180 100644 --- a/ace/Proactor_Impl.h +++ b/ace/Proactor_Impl.h @@ -21,7 +21,6 @@ #if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) // This only works on Win32 platforms and on Unix platforms supporting // aio calls. -#include "ace/OS.h" #include "ace/Asynch_IO.h" #include "ace/Reactor.h" diff --git a/ace/Process.cpp b/ace/Process.cpp index 99761069c48..0f2abd0d7b0 100644 --- a/ace/Process.cpp +++ b/ace/Process.cpp @@ -1,16 +1,18 @@ // $Id$ -#include "ace/OS.h" #include "ace/Process.h" -#include "ace/ARGV.h" -#include "ace/Signal.h" -#include "ace/SString.h" -#include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) #include "ace/Process.i" #endif /* __ACE_INLINE__ */ +#include "ace/ARGV.h" +#include "ace/Signal.h" +#include "ace/SString.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_sys_socket.h" + ACE_RCSID (ace, Process, "$Id$") @@ -578,7 +580,7 @@ ACE_Process_Options::setenv (ACE_TCHAR *envp[]) while (envp[i]) { if (this->setenv_i (envp[i], - ACE_OS_String::strlen (envp[i])) == -1) + ACE_OS::strlen (envp[i])) == -1) return -1; i++; } @@ -609,7 +611,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *format, ...) // Append the string to are environment buffer. if (this->setenv_i (stack_buf, - ACE_OS_String::strlen (stack_buf)) == -1) + ACE_OS::strlen (stack_buf)) == -1) return -1; #if defined (ACE_WIN32) @@ -646,7 +648,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name, // Append the string to our environment buffer. if (this->setenv_i (stack_buf, - ACE_OS_String::strlen (stack_buf)) == -1) + ACE_OS::strlen (stack_buf)) == -1) return -1; #if defined (ACE_WIN32) diff --git a/ace/Process.i b/ace/Process.i index db86fe4f4d2..ad887d0f048 100644 --- a/ace/Process.i +++ b/ace/Process.i @@ -2,6 +2,9 @@ // $Id$ #include "ace/ACE.h" +#include "ace/OS_NS_sys_wait.h" +#include "ace/OS_NS_signal.h" +#include "ace/OS_NS_pwd.h" #if defined (ACE_WIN32) diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp index 6a3cba11800..86de468f43b 100644 --- a/ace/Process_Manager.cpp +++ b/ace/Process_Manager.cpp @@ -1,17 +1,20 @@ // $Id$ // Process_Manager.cpp -#include "ace/ACE.h" -#include "ace/Process.h" -#include "ace/Signal.h" #include "ace/Process_Manager.h" -#include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) #include "ace/Process_Manager.i" #endif /* __ACE_INLINE__ */ +#include "ace/ACE.h" +#include "ace/Process.h" +#include "ace/Signal.h" +#include "ace/Object_Manager.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_sys_wait.h" +#include "ace/OS_NS_signal.h" + ACE_RCSID(ace, Process_Manager, "$Id$") #if defined (ACE_HAS_SIG_C_FUNC) diff --git a/ace/Profile_Timer.cpp b/ace/Profile_Timer.cpp index 4beedd397f0..ca72b14d6d3 100644 --- a/ace/Profile_Timer.cpp +++ b/ace/Profile_Timer.cpp @@ -1,12 +1,14 @@ // $Id$ #include "ace/Profile_Timer.h" -#include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) # include "ace/Profile_Timer.i" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" + ACE_RCSID(ace, Profile_Timer, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_Profile_Timer) diff --git a/ace/Profile_Timer.h b/ace/Profile_Timer.h index a8000401e84..3f96b41a581 100644 --- a/ace/Profile_Timer.h +++ b/ace/Profile_Timer.h @@ -21,7 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" #include "ace/High_Res_Timer.h" /** diff --git a/ace/Profile_Timer.i b/ace/Profile_Timer.i index e77af9b1686..b4070d3250c 100644 --- a/ace/Profile_Timer.i +++ b/ace/Profile_Timer.i @@ -1,6 +1,10 @@ /* -*- C++ -*- */ // $Id$ +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_sys_resource.h" +#include "ace/Global_Macros.h" + #if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32) # if defined (ACE_HAS_PRUSAGE_T) diff --git a/ace/RMCast/RMCast.h b/ace/RMCast/RMCast.h index 2259af24fbb..9d9d7650e54 100644 --- a/ace/RMCast/RMCast.h +++ b/ace/RMCast/RMCast.h @@ -18,13 +18,14 @@ #define ACE_RMCAST_H #include /**/ "ace/pre.h" -#include "ace/OS.h" #include "RMCast_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Basic_Types.h" + class ACE_Message_Block; class ACE_RMCast_Proxy; diff --git a/ace/RMCast/RMCast_Copy_On_Write.h b/ace/RMCast/RMCast_Copy_On_Write.h index 4421ca92b83..c73dade591b 100644 --- a/ace/RMCast/RMCast_Copy_On_Write.h +++ b/ace/RMCast/RMCast_Copy_On_Write.h @@ -6,7 +6,9 @@ #include /**/ "ace/pre.h" #include "RMCast_Worker.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Basic_Types.h" +#include "ace/Condition_Thread_Mutex.h" //! A wrapper to implement reference counted collections template<class COLLECTION, class ITERATOR> diff --git a/ace/RMCast/RMCast_Copy_On_Write.i b/ace/RMCast/RMCast_Copy_On_Write.i index 3c069c84eb6..c83483c0729 100644 --- a/ace/RMCast/RMCast_Copy_On_Write.i +++ b/ace/RMCast/RMCast_Copy_On_Write.i @@ -1,5 +1,9 @@ +// -*- C++ -*- // $Id$ +#include "ace/Guard_T.h" +#include "ace/Null_Mutex.h" + template<class COLLECTION, class ITERATOR> ACE_INLINE ACE_RMCast_Copy_On_Write_Collection<COLLECTION,ITERATOR>:: ACE_RMCast_Copy_On_Write_Collection (void) diff --git a/ace/RMCast/RMCast_IO_UDP.cpp b/ace/RMCast/RMCast_IO_UDP.cpp index cfed8a53d98..13801b47bd5 100644 --- a/ace/RMCast/RMCast_IO_UDP.cpp +++ b/ace/RMCast/RMCast_IO_UDP.cpp @@ -1,16 +1,21 @@ // $Id$ #include "RMCast_IO_UDP.h" + +#if !defined (__ACE_INLINE__) +# include "RMCast_IO_UDP.i" +#endif /* ! __ACE_INLINE__ */ + #include "RMCast_UDP_Proxy.h" #include "RMCast_Module_Factory.h" #include "ace/Handle_Set.h" #include "ace/Reactor.h" #include "ace/Message_Block.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_IO_UDP.i" -#endif /* ! __ACE_INLINE__ */ +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_select.h" +#include "ace/os_include/arpa/os_inet.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(ace, RMCast_IO_UDP, "RMCast_IO_UDP.cpp,v 1.12 2000/12/20 22:00:33 oci Exp") diff --git a/ace/RMCast/RMCast_IO_UDP.h b/ace/RMCast/RMCast_IO_UDP.h index 4881233cb59..9e1a83dc032 100644 --- a/ace/RMCast/RMCast_IO_UDP.h +++ b/ace/RMCast/RMCast_IO_UDP.h @@ -19,6 +19,7 @@ #include "ace/Hash_Map_Manager.h" #include "ace/Synch.h" #include "ace/INET_Addr.h" +#include "ace/Null_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/RMCast/RMCast_Membership.cpp b/ace/RMCast/RMCast_Membership.cpp index 91c9b1a9cea..598e05019af 100644 --- a/ace/RMCast/RMCast_Membership.cpp +++ b/ace/RMCast/RMCast_Membership.cpp @@ -3,12 +3,14 @@ // #include "RMCast_Membership.h" -#include "RMCast_Proxy.h" #if !defined (__ACE_INLINE__) # include "RMCast_Membership.i" #endif /* ! __ACE_INLINE__ */ +#include "RMCast_Proxy.h" +#include "ace/Guard_T.h" + ACE_RCSID(ace, RMCast_Membership, "$Id$") ACE_RMCast_Membership::~ACE_RMCast_Membership (void) diff --git a/ace/RMCast/RMCast_Membership.h b/ace/RMCast/RMCast_Membership.h index beab2c881f9..14d5790e584 100644 --- a/ace/RMCast/RMCast_Membership.h +++ b/ace/RMCast/RMCast_Membership.h @@ -20,7 +20,8 @@ #include "RMCast_Module.h" #include "ace/Containers.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/RMCast/RMCast_Reassembly.h b/ace/RMCast/RMCast_Reassembly.h index bc3fc17049d..d4ed999cf78 100644 --- a/ace/RMCast/RMCast_Reassembly.h +++ b/ace/RMCast/RMCast_Reassembly.h @@ -16,7 +16,9 @@ #include "RMCast_Module.h" #include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Null_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/RMCast/RMCast_Reordering.h b/ace/RMCast/RMCast_Reordering.h index 4ecf824acac..dadca2aa0f6 100644 --- a/ace/RMCast/RMCast_Reordering.h +++ b/ace/RMCast/RMCast_Reordering.h @@ -17,7 +17,9 @@ #include "RMCast_Module.h" #include "ace/RB_Tree.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Null_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/RMCast/RMCast_Sequencer.cpp b/ace/RMCast/RMCast_Sequencer.cpp index f8bc0e6c57d..356fbb4a01b 100644 --- a/ace/RMCast/RMCast_Sequencer.cpp +++ b/ace/RMCast/RMCast_Sequencer.cpp @@ -8,6 +8,8 @@ # include "RMCast_Sequencer.i" #endif /* ! __ACE_INLINE__ */ +#include "ace/Guard_T.h" + ACE_RCSID(ace, RMCast_Sequencer, "$Id$") ACE_RMCast_Sequencer::~ACE_RMCast_Sequencer (void) diff --git a/ace/RMCast/RMCast_Sequencer.h b/ace/RMCast/RMCast_Sequencer.h index 8e6447dce62..28f83a1d4b3 100644 --- a/ace/RMCast/RMCast_Sequencer.h +++ b/ace/RMCast/RMCast_Sequencer.h @@ -16,7 +16,8 @@ #include /**/ "ace/pre.h" #include "RMCast_Module.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/RMCast/RMCast_UDP_Proxy.cpp b/ace/RMCast/RMCast_UDP_Proxy.cpp index c84b8c0f2ef..fb7eaf72f76 100644 --- a/ace/RMCast/RMCast_UDP_Proxy.cpp +++ b/ace/RMCast/RMCast_UDP_Proxy.cpp @@ -1,14 +1,17 @@ // $Id$ #include "RMCast_UDP_Proxy.h" -#include "RMCast_Module.h" -#include "RMCast_IO_UDP.h" -#include "ace/Message_Block.h" #if !defined (__ACE_INLINE__) # include "RMCast_UDP_Proxy.i" #endif /* ! __ACE_INLINE__ */ +#include "RMCast_Module.h" +#include "RMCast_IO_UDP.h" +#include "ace/Message_Block.h" +#include "ace/OS_NS_string.h" +#include "ace/os_include/arpa/os_inet.h" + ACE_RCSID(ace, RMCast_UDP_Proxy, "$Id$") ACE_RMCast_UDP_Proxy::ACE_RMCast_UDP_Proxy (ACE_RMCast_IO_UDP *io_udp, diff --git a/ace/RW_Mutex.cpp b/ace/RW_Mutex.cpp index 9da0d1199c0..cde11394329 100644 --- a/ace/RW_Mutex.cpp +++ b/ace/RW_Mutex.cpp @@ -17,6 +17,8 @@ #include "ace/RW_Mutex.inl" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" + ACE_RCSID(ace, RW_Mutex, "$Id$") void diff --git a/ace/RW_Mutex.h b/ace/RW_Mutex.h index 41ed4e91fcb..5129f31e253 100644 --- a/ace/RW_Mutex.h +++ b/ace/RW_Mutex.h @@ -25,7 +25,7 @@ // ACE platform supports some form of threading. #if defined (ACE_HAS_THREADS) -#include "ace/OS.h" +#include "ace/OS_NS_Thread.h" /** * @class ACE_RW_Mutex diff --git a/ace/RW_Process_Mutex.h b/ace/RW_Process_Mutex.h index 8cfc164ac44..ad97920779b 100644 --- a/ace/RW_Process_Mutex.h +++ b/ace/RW_Process_Mutex.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Default_Constants.h" + /** * @class ACE_RW_Process_Mutex * diff --git a/ace/Reactor_Timer_Interface.h b/ace/Reactor_Timer_Interface.h index 484b1fb55c5..e015a4d314a 100644 --- a/ace/Reactor_Timer_Interface.h +++ b/ace/Reactor_Timer_Interface.h @@ -18,6 +18,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Time_Value.h" + class ACE_Event_Handler; /** diff --git a/ace/Read_Buffer.cpp b/ace/Read_Buffer.cpp index 34b38e54634..f576c3e1db0 100644 --- a/ace/Read_Buffer.cpp +++ b/ace/Read_Buffer.cpp @@ -1,14 +1,16 @@ // $Id$ #include "ace/Read_Buffer.h" -#include "ace/Log_Msg.h" -#include "ace/Malloc_Base.h" -#include "ace/Service_Config.h" #if !defined (__ACE_INLINE__) #include "ace/Read_Buffer.i" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" +#include "ace/Malloc_Base.h" +#include "ace/Service_Config.h" +#include "ace/OS_NS_stdio.h" + ACE_RCSID(ace, Read_Buffer, "$Id$") void diff --git a/ace/Recursive_Thread_Mutex.cpp b/ace/Recursive_Thread_Mutex.cpp index 0644e4ba6f7..15a809ed898 100644 --- a/ace/Recursive_Thread_Mutex.cpp +++ b/ace/Recursive_Thread_Mutex.cpp @@ -17,6 +17,8 @@ #include "ace/Recursive_Thread_Mutex.inl" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" + ACE_RCSID(ace, Recursive_Thread_Mutex, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_Recursive_Thread_Mutex) diff --git a/ace/Recursive_Thread_Mutex.h b/ace/Recursive_Thread_Mutex.h index a5b90c59ca8..3732ff42334 100644 --- a/ace/Recursive_Thread_Mutex.h +++ b/ace/Recursive_Thread_Mutex.h @@ -27,7 +27,7 @@ #else /* ACE_HAS_THREADS */ // ACE platform supports some form of threading. -#include "ace/OS.h" +#include "ace/OS_NS_Thread.h" /** * @class ACE_Recursive_Thread_Mutex diff --git a/ace/Refcounted_Auto_Ptr.h b/ace/Refcounted_Auto_Ptr.h index f7590ec85ce..c6b6910b12f 100644 --- a/ace/Refcounted_Auto_Ptr.h +++ b/ace/Refcounted_Auto_Ptr.h @@ -14,7 +14,6 @@ #define ACE_REFCOUNTED_AUTO_PTR_H #include /**/ "ace/pre.h" -#include "ace/OS.h" #include "ace/Auto_Ptr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/ace/Registry.cpp b/ace/Registry.cpp index e09443e075c..5ffeb0221ab 100644 --- a/ace/Registry.cpp +++ b/ace/Registry.cpp @@ -650,7 +650,7 @@ ACE_Registry::make_name (const ACE_TString &string) new_position - last_position); // Skip past the seperator new_position += - ACE_OS_String::strlen (ACE_Registry::STRING_SEPARATOR); + ACE_OS::strlen (ACE_Registry::STRING_SEPARATOR); } else { diff --git a/ace/Registry.h b/ace/Registry.h index 0680cf1f0ee..e163d4e9592 100644 --- a/ace/Registry.h +++ b/ace/Registry.h @@ -15,7 +15,7 @@ #define ACE_REGISTRY_H #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Registry_Name_Space.h b/ace/Registry_Name_Space.h index 5ce3fc2431f..7635b0bafbe 100644 --- a/ace/Registry_Name_Space.h +++ b/ace/Registry_Name_Space.h @@ -15,7 +15,7 @@ #define ACE_REGISTRY_NAME_SPACE_H #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp index ce1af622d17..003cda8858c 100644 --- a/ace/Remote_Name_Space.cpp +++ b/ace/Remote_Name_Space.cpp @@ -49,7 +49,7 @@ ACE_Remote_Name_Space::bind (const ACE_NS_WString &name, ACE_UINT32 value_len = ACE_static_cast (ACE_UINT32, value.length () * sizeof (ACE_WCHAR_T)); ACE_UINT32 type_len = - ACE_static_cast (ACE_UINT32, ACE_OS_String::strlen (type)); + ACE_static_cast (ACE_UINT32, ACE_OS::strlen (type)); ACE_Name_Request request (ACE_Name_Request::BIND, name_urep.get (), name_len, @@ -73,7 +73,7 @@ ACE_Remote_Name_Space::rebind (const ACE_NS_WString &name, ACE_UINT32 value_len = ACE_static_cast (ACE_UINT32, value.length () * sizeof (ACE_WCHAR_T)); ACE_UINT32 type_len = - ACE_static_cast (ACE_UINT32, ACE_OS_String::strlen (type)); + ACE_static_cast (ACE_UINT32, ACE_OS::strlen (type)); ACE_Name_Request request (ACE_Name_Request::REBIND, name_urep.get (), name_len, diff --git a/ace/SOCK.h b/ace/SOCK.h index 53ac2a2e529..076f2e57196 100644 --- a/ace/SOCK.h +++ b/ace/SOCK.h @@ -22,7 +22,6 @@ #include "ace/Addr.h" #include "ace/IPC_SAP.h" -#include "ace/OS.h" #if defined (SD_RECEIVE) #define ACE_SHUTDOWN_READ SD_RECEIVE diff --git a/ace/SOCK.i b/ace/SOCK.i index 78b17d3e36e..63adf4e2577 100644 --- a/ace/SOCK.i +++ b/ace/SOCK.i @@ -3,6 +3,8 @@ // SOCK.i +#include "OS_NS_sys_socket.h" + ASYS_INLINE ACE_SOCK::~ACE_SOCK (void) { diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp index 898bffd60ba..2ff777ee54b 100644 --- a/ace/SOCK_Acceptor.cpp +++ b/ace/SOCK_Acceptor.cpp @@ -2,16 +2,18 @@ // $Id$ #include "ace/SOCK_Acceptor.h" + +#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#include "ace/SOCK_Acceptor.i" +#endif /* ACE_LACKS_INLINE_FUNCTIONS */ + #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" #if !defined (ACE_HAS_WINCE) #include "ace/OS_QoS.h" #endif // ACE_HAS_WINCE -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - ACE_RCSID(ace, SOCK_Acceptor, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Acceptor) diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index 3f93f73fa92..062468327a6 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -1,12 +1,16 @@ #include "ace/SOCK_Dgram.h" + +#if defined (ACE_LACKS_INLINE_FUNCTIONS) +# include "ace/SOCK_Dgram.i" +#endif + #include "ace/Handle_Set.h" #include "ace/Log_Msg.h" #include "ace/INET_Addr.h" #include "ace/ACE.h" - -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Dgram.i" -#endif +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_select.h" +#include "ace/os_include/net/os_if.h" ACE_RCSID (ace, SOCK_Dgram, diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h index 9aee48839d6..826884c654b 100644 --- a/ace/SOCK_Dgram.h +++ b/ace/SOCK_Dgram.h @@ -24,6 +24,8 @@ #include "ace/Addr.h" +class ACE_Time_Value; + /** * @class ACE_SOCK_Dgram * diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp index 560545fd0b6..c95735395c4 100644 --- a/ace/SOCK_Dgram_Bcast.cpp +++ b/ace/SOCK_Dgram_Bcast.cpp @@ -1,13 +1,17 @@ // $Id$ #include "ace/SOCK_Dgram_Bcast.h" -#include "ace/Log_Msg.h" -#include "ace/ACE.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/SOCK_Dgram_Bcast.i" #endif +#include "ace/Log_Msg.h" +#include "ace/ACE.h" +#include "ace/OS_NS_string.h" +#include "ace/os_include/net/os_if.h" +#include "ace/OS_NS_netdb.h" + ACE_RCSID(ace, SOCK_Dgram_Bcast, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Bcast) diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp index 2aaff6d51ab..95d0937bbae 100644 --- a/ace/SOCK_Dgram_Mcast.cpp +++ b/ace/SOCK_Dgram_Mcast.cpp @@ -6,6 +6,11 @@ #include "ace/SOCK_Dgram_Mcast.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_errno.h" +#include "ace/os_include/net/os_if.h" +#include "ace/os_include/arpa/os_inet.h" + ACE_RCSID (ace, SOCK_Dgram_Mcast, "$Id$") @@ -31,13 +36,13 @@ public: { if (ip_addr.addr_to_string (ret_string, len, 1) == -1) { - ACE_OS_String::strcpy (ret_string, ACE_LIB_TEXT ("<?>")); + ACE_OS::strcpy (ret_string, ACE_LIB_TEXT ("<?>")); } else { ACE_TCHAR *pc; if (clip_portnum - && (pc = ACE_OS_String::strchr (ret_string, ACE_LIB_TEXT (':')))) + && (pc = ACE_OS::strchr (ret_string, ACE_LIB_TEXT (':')))) *pc = ACE_LIB_TEXT ('\0'); // clip port# info. } } @@ -99,10 +104,10 @@ ACE_SOCK_Dgram_Mcast::dump (void) const ACE_NTOHL (pm->imr_interface.s_addr)); ACE_SDM_helpers::addr_to_string (if_addr, iface_string, sizeof iface_string, 1); - if (ACE_OS_String::strcmp (iface_string, ACE_LIB_TEXT ("0.0.0.0")) == 0) + if (ACE_OS::strcmp (iface_string, ACE_LIB_TEXT ("0.0.0.0")) == 0) // Receives on system default iface. (Note that null_iface_opt_ // option processing has already occurred.) - ACE_OS_String::strcpy (iface_string, ACE_LIB_TEXT ("<default>")); + ACE_OS::strcpy (iface_string, ACE_LIB_TEXT ("<default>")); // Dump info. ACE_DEBUG ((LM_DEBUG, @@ -155,7 +160,7 @@ ACE_SOCK_Dgram_Mcast::open (const ACE_INET_Addr &mcast_addr, reuse_addr) == -1) return -1; - return open_i (mcast_addr, net_if, reuse_addr); + return this->open_i (mcast_addr, net_if, reuse_addr); } int @@ -222,8 +227,8 @@ ACE_SOCK_Dgram_Mcast::open_i (const ACE_INET_Addr &mcast_addr, &(send_mreq.imr_interface), sizeof send_mreq.imr_interface) == -1) return -1; - this->send_net_if_ = new ACE_TCHAR[ACE_OS_String::strlen (net_if) + 1]; - ACE_OS_String::strcpy (this->send_net_if_, net_if); + this->send_net_if_ = new ACE_TCHAR[ACE_OS::strlen (net_if) + 1]; + ACE_OS::strcpy (this->send_net_if_, net_if); #else // Send interface option not supported - ignore it. // (We may have been invoked by ::subscribe, so we have to allow @@ -657,7 +662,7 @@ ACE_SOCK_Dgram_Mcast::make_multicast_ifaddr (ip_mreq *ret_mreq, // Look up the interface by number, not name. if_address.ifr_ifno = ACE_OS::atoi (net_if); #else - ACE_OS_String::strcpy (if_address.ifr_name, net_if); + ACE_OS::strcpy (if_address.ifr_name, net_if); #endif /* defined (ACE_PSOS) */ if (ACE_OS::ioctl (this->get_handle (), diff --git a/ace/SOCK_IO.cpp b/ace/SOCK_IO.cpp index 83d13192be0..c9a8a881289 100644 --- a/ace/SOCK_IO.cpp +++ b/ace/SOCK_IO.cpp @@ -2,12 +2,14 @@ // $Id$ #include "ace/SOCK_IO.h" -#include "ace/Handle_Set.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/SOCK_IO.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#include "ace/Handle_Set.h" +#include "ace/OS_NS_sys_select.h" + ACE_RCSID(ace, SOCK_IO, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_IO) diff --git a/ace/SOCK_SEQPACK_Acceptor.cpp b/ace/SOCK_SEQPACK_Acceptor.cpp index 6c88f95a028..edcbb47406c 100644 --- a/ace/SOCK_SEQPACK_Acceptor.cpp +++ b/ace/SOCK_SEQPACK_Acceptor.cpp @@ -3,13 +3,13 @@ #include "ace/SOCK_SEQPACK_Acceptor.h" -#include "ace/Log_Msg.h" - #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/SOCK_SEQPACK_Acceptor.i" #endif /* ACE_LACKS_INLINE_FUNCTIONS */ #include "ace/Auto_Ptr.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" ACE_RCSID(ace, SOCK_SEQPACK_Acceptor, "SOCK_SEQPACK_Acceptor.cpp,v 4.30 2002/03/08 23:18:09 spark Exp") diff --git a/ace/SOCK_SEQPACK_Association.cpp b/ace/SOCK_SEQPACK_Association.cpp index fcf3f0b9b7f..3b62bc0ed4c 100644 --- a/ace/SOCK_SEQPACK_Association.cpp +++ b/ace/SOCK_SEQPACK_Association.cpp @@ -1,13 +1,15 @@ // SOCK_SEQPACK_Association.cpp -#include /**/ "ace/SOCK_SEQPACK_Association.h" -#include /**/ "ace/Auto_Ptr.h" -#include /**/ "ace/Log_Msg.h" +#include "ace/SOCK_SEQPACK_Association.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include /**/ "ace/SOCK_SEQPACK_Association.i" +#include "ace/SOCK_SEQPACK_Association.i" #endif +#include "ace/Auto_Ptr.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" + ACE_RCSID(ace, SOCK_SEQPACK_Association, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Association) diff --git a/ace/SPIPE.cpp b/ace/SPIPE.cpp index eafbc05925f..f91c7ff545d 100644 --- a/ace/SPIPE.cpp +++ b/ace/SPIPE.cpp @@ -7,6 +7,8 @@ #include "ace/SPIPE.i" #endif +#include "ace/OS_NS_unistd.h" + ACE_RCSID(ace, SPIPE, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE) diff --git a/ace/SPIPE_Addr.cpp b/ace/SPIPE_Addr.cpp index b234e9e3882..4540fac90b9 100644 --- a/ace/SPIPE_Addr.cpp +++ b/ace/SPIPE_Addr.cpp @@ -116,10 +116,10 @@ ACE_SPIPE_Addr::set (const ACE_TCHAR *addr, ACE_OS::strcat (temp, ACE_LIB_TEXT ("\\pipe\\")); ACE_OS::strcat (temp, colonp + 1); } - len += ACE_static_cast (int, ACE_OS_String::strlen (temp)); + len += ACE_static_cast (int, ACE_OS::strlen (temp)); this->ACE_Addr::base_set (AF_SPIPE, len); - ACE_OS_String::strcpy (this->SPIPE_addr_.rendezvous_, temp); + ACE_OS::strcpy (this->SPIPE_addr_.rendezvous_, temp); #else this->ACE_Addr::base_set (AF_SPIPE, ACE_OS::strlen (addr) + 1 + len); diff --git a/ace/SPIPE_Addr.h b/ace/SPIPE_Addr.h index 5510f7e0e55..cf801317edb 100644 --- a/ace/SPIPE_Addr.h +++ b/ace/SPIPE_Addr.h @@ -23,7 +23,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Addr.h" -#include "ace/OS.h" +#include "ace/os_include/sys/os_types.h" +#include "ace/os_include/os_dirent.h" /** * @class ACE_SPIPE_Addr diff --git a/ace/SPIPE_Stream.i b/ace/SPIPE_Stream.i index c52523d28b7..9e5f8af1619 100644 --- a/ace/SPIPE_Stream.i +++ b/ace/SPIPE_Stream.i @@ -3,6 +3,8 @@ // SPIPE_Stream.i +#include "ace/OS_NS_sys_uio.h" + // Create an ACE_SPIPE_Stream. ASYS_INLINE int diff --git a/ace/SString.cpp b/ace/SString.cpp index a81a290333c..052eafd1993 100644 --- a/ace/SString.cpp +++ b/ace/SString.cpp @@ -314,7 +314,7 @@ ACE_NS_WString::ACE_NS_WString (const char *s, if (s == 0) return; - this->len_ = this->buf_len_ = ACE_OS_String::strlen (s); + this->len_ = this->buf_len_ = ACE_OS::strlen (s); if (this->buf_len_ == 0) return; diff --git a/ace/SString.h b/ace/SString.h index 104a9b0cf1d..6fbaa7a93c1 100644 --- a/ace/SString.h +++ b/ace/SString.h @@ -21,8 +21,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/String_Base.h" -#include "ace/OS.h" - #if !defined (ACE_DEFAULT_GROWSIZE) #define ACE_DEFAULT_GROWSIZE 32 diff --git a/ace/SV_Message.h b/ace/SV_Message.h index 6a988490b15..92a0b17c7c7 100644 --- a/ace/SV_Message.h +++ b/ace/SV_Message.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" - /** * @class ACE_SV_Message * diff --git a/ace/SV_Message.i b/ace/SV_Message.i index 8c08e41d151..44cd5e25759 100644 --- a/ace/SV_Message.i +++ b/ace/SV_Message.i @@ -3,6 +3,8 @@ // SV_Message.i +#include "ace/Global_Macros.h" + ACE_INLINE ACE_SV_Message::ACE_SV_Message (long t) : type_ (t) diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h index 7c8296824be..5c813805573 100644 --- a/ace/SV_Message_Queue.h +++ b/ace/SV_Message_Queue.h @@ -22,6 +22,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SV_Message.h" +#include "ace/os_include/sys/os_ipc.h" +#include "ace/Default_Constants.h" /** * @class ACE_SV_Message_Queue diff --git a/ace/SV_Message_Queue.i b/ace/SV_Message_Queue.i index 65c092136f7..182b44c3cc4 100644 --- a/ace/SV_Message_Queue.i +++ b/ace/SV_Message_Queue.i @@ -3,7 +3,8 @@ // SV_Message_Queue.i -#include "ace/SV_Message_Queue.h" +#include "ace/Global_Macros.h" +#include "ace/OS_NS_sys_msg.h" // Open a message queue using the <external_id>. diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h index eb48aa15a9d..b2471d03a9a 100644 --- a/ace/SV_Semaphore_Simple.h +++ b/ace/SV_Semaphore_Simple.h @@ -21,7 +21,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/os_include/sys/os_ipc.h" +#include "ace/os_include/sys/os_sem.h" +#include "ace/Default_Constants.h" #if defined (ACE_WIN32) && !defined (ACE_PSOS) // Default semaphore key and mutex name diff --git a/ace/SV_Semaphore_Simple.i b/ace/SV_Semaphore_Simple.i index 448ad8cd5d2..3fd4fb9f81c 100644 --- a/ace/SV_Semaphore_Simple.i +++ b/ace/SV_Semaphore_Simple.i @@ -3,6 +3,9 @@ // SV_Semaphore_Simple.i +#include "ace/Global_Macros.h" +#include "ace/OS_NS_Thread.h" + ASYS_INLINE int ACE_SV_Semaphore_Simple::control (int cmd, semun arg, diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h index dfd9d1b0db1..71faf4e8b4d 100644 --- a/ace/SV_Shared_Memory.h +++ b/ace/SV_Shared_Memory.h @@ -21,7 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/os_include/sys/os_ipc.h" +#include "ace/Default_Constants.h" /** * @class ACE_SV_Shared_Memory diff --git a/ace/SV_Shared_Memory.i b/ace/SV_Shared_Memory.i index 3e7bf1db6ef..3ec2f26eaa0 100644 --- a/ace/SV_Shared_Memory.i +++ b/ace/SV_Shared_Memory.i @@ -3,7 +3,8 @@ // SV_Shared_Memory.i -#include "ace/SV_Shared_Memory.h" +#include "ace/OS_NS_sys_shm.h" +#include "ace/Global_Macros.h" ACE_INLINE size_t ACE_SV_Shared_Memory::round_up (size_t len) diff --git a/ace/Sample_History.cpp b/ace/Sample_History.cpp index 38bc4507776..349d36bf38c 100644 --- a/ace/Sample_History.cpp +++ b/ace/Sample_History.cpp @@ -1,14 +1,15 @@ // $Id$ #include "ace/Sample_History.h" -#include "ace/Basic_Stats.h" -#include "ace/Log_Msg.h" -#include "ace/OS.h" #if !defined (__ACE_INLINE__) #include "ace/Sample_History.inl" #endif /* __ACE_INLINE__ */ +#include "ace/Basic_Stats.h" +#include "ace/Log_Msg.h" +#include "ace/OS_Memory.h" + ACE_RCSID(ace, Sample_History, "$Id$") ACE_Sample_History::ACE_Sample_History (size_t max_samples) diff --git a/ace/Sched_Params.h b/ace/Sched_Params.h index 0edeaffceec..d5776449a2d 100644 --- a/ace/Sched_Params.h +++ b/ace/Sched_Params.h @@ -15,12 +15,15 @@ #define ACE_SCHED_PARAMS_H #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Time_Value.h" +#include "ace/OS_NS_Thread.h" + /** * @class ACE_Sched_Params * diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index f62b7b85b2a..93429f09b2c 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -13,6 +13,8 @@ #include "ace/Log_Msg.h" #include "ace/Thread.h" #include "ace/Timer_Heap.h" +#include "ace/OS_NS_sys_select.h" +#include "ace/OS_NS_sys_stat.h" // For timer_queue_ #include "ace/Recursive_Thread_Mutex.h" diff --git a/ace/Semaphore.cpp b/ace/Semaphore.cpp index 44f3fa6e882..2cc8eef740d 100644 --- a/ace/Semaphore.cpp +++ b/ace/Semaphore.cpp @@ -6,6 +6,8 @@ #include "ace/Semaphore.inl" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" + ACE_RCSID (ace, Semaphore, "$Id$") diff --git a/ace/Semaphore.h b/ace/Semaphore.h index b152f2ac5a9..01c116ef991 100644 --- a/ace/Semaphore.h +++ b/ace/Semaphore.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/OS_NS_Thread.h" class ACE_Time_Value; @@ -103,7 +103,7 @@ public: /// Increment the semaphore by <release_count>, potentially /// unblocking waiting threads. - int release (u_int release_count); + int release (unsigned int release_count); /** * Acquire semaphore ownership. This calls <acquire> and is only diff --git a/ace/Semaphore.inl b/ace/Semaphore.inl index 0702173fc78..a519c4e7920 100644 --- a/ace/Semaphore.inl +++ b/ace/Semaphore.inl @@ -57,7 +57,7 @@ ACE_Semaphore::release (void) } ACE_INLINE int -ACE_Semaphore::release (u_int release_count) +ACE_Semaphore::release (unsigned int release_count) { // ACE_TRACE ("ACE_Semaphore::release"); return ACE_OS::sema_post (&this->semaphore_, release_count); diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp index a9536b7f514..26461919013 100644 --- a/ace/Service_Config.cpp +++ b/ace/Service_Config.cpp @@ -1,5 +1,11 @@ // $Id$ +#include "ace/Service_Config.h" + +#if !defined (__ACE_INLINE__) +#include "ace/Service_Config.i" +#endif /* __ACE_INLINE__ */ + #include "ace/Svc_Conf.h" #include "ace/Get_Opt.h" #include "ace/ARGV.h" @@ -12,13 +18,9 @@ #include "ace/Reactor.h" #include "ace/Thread_Manager.h" #include "ace/DLL.h" - -#include "ace/Service_Config.h" +#include "ace/OS_NS_stdio.h" #include "ace/XML_Svc_Conf.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Service_Config.i" -#endif /* __ACE_INLINE__ */ +#include "ace/OS_NS_time.h" ACE_RCSID (ace, Service_Config, diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp index 40437aab625..3e8f90f0cae 100644 --- a/ace/Service_Manager.cpp +++ b/ace/Service_Manager.cpp @@ -1,16 +1,17 @@ +#include "ace/Service_Manager.h" + +#if !defined (__ACE_INLINE__) +#include "ace/Service_Manager.i" +#endif /* __ACE_INLINE__ */ + #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" #include "ace/Service_Repository.h" #include "ace/Service_Config.h" -#include "ace/Service_Manager.h" #include "ace/Service_Types.h" #include "ace/Reactor.h" #include "ace/WFMO_Reactor.h" - -#if !defined (__ACE_INLINE__) -#include "ace/Service_Manager.i" -#endif /* __ACE_INLINE__ */ - +#include "ace/OS_NS_stdio.h" ACE_RCSID (ace, Service_Manager, @@ -82,7 +83,7 @@ ACE_Service_Manager::info (ACE_TCHAR **strp, size_t length) const return -1; else ACE_OS::strsncpy (*strp, buf, length); - return ACE_static_cast (int, ACE_OS_String::strlen (buf)); + return ACE_static_cast (int, ACE_OS::strlen (buf)); } int @@ -173,7 +174,7 @@ ACE_Service_Manager::list_services (void) sri.next (sr) != 0; sri.advance ()) { - size_t len = ACE_OS_String::strlen (sr->name ()) + 11; + size_t len = ACE_OS::strlen (sr->name ()) + 11; ACE_TCHAR buf[BUFSIZ]; ACE_TCHAR *p = buf + len; diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp index e2654349561..c6174357f11 100644 --- a/ace/Service_Repository.cpp +++ b/ace/Service_Repository.cpp @@ -1,13 +1,15 @@ #include "ace/Service_Repository.h" -#include "ace/Service_Types.h" -#include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" -#include "ace/ACE.h" #if !defined (__ACE_INLINE__) #include "ace/Service_Repository.i" #endif /* __ACE_INLINE__ */ +#include "ace/Service_Types.h" +#include "ace/Object_Manager.h" +#include "ace/Log_Msg.h" +#include "ace/ACE.h" +#include "ace/OS_NS_string.h" + ACE_RCSID (ace, Service_Repository, "$Id$") diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp index f29bc9205c7..8218f26aa79 100644 --- a/ace/Service_Types.cpp +++ b/ace/Service_Types.cpp @@ -1,8 +1,14 @@ // $Id$ #include "ace/Service_Types.h" + +#if !defined (__ACE_INLINE__) +#include "ace/Service_Types.i" +#endif /* __ACE_INLINE__ */ + #include "ace/Stream_Modules.h" #include "ace/Stream.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(ace, Service_Types, "$Id$") @@ -10,10 +16,6 @@ typedef ACE_Stream<ACE_SYNCH> MT_Stream; typedef ACE_Module<ACE_SYNCH> MT_Module; typedef ACE_Task<ACE_SYNCH> MT_Task; -#if !defined (__ACE_INLINE__) -#include "ace/Service_Types.i" -#endif /* __ACE_INLINE__ */ - ACE_ALLOC_HOOK_DEFINE(ACE_Service_Type_Impl) void @@ -204,7 +206,7 @@ ACE_Module_Type::info (ACE_TCHAR **str, size_t len) const return -1; else ACE_OS::strsncpy (*str, buf, len); - return ACE_static_cast (int, ACE_OS_String::strlen (buf)); + return ACE_static_cast (int, ACE_OS::strlen (buf)); } void @@ -288,7 +290,7 @@ ACE_Stream_Type::info (ACE_TCHAR **str, size_t len) const return -1; else ACE_OS::strsncpy (*str, buf, len); - return ACE_static_cast (int, ACE_OS_String::strlen (buf)); + return ACE_static_cast (int, ACE_OS::strlen (buf)); } int diff --git a/ace/Shared_Memory.h b/ace/Shared_Memory.h index 2f2af867c54..7e1b096b528 100644 --- a/ace/Shared_Memory.h +++ b/ace/Shared_Memory.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" - /** * @class ACE_Shared_Memory * diff --git a/ace/Shared_Memory_SV.i b/ace/Shared_Memory_SV.i index f1998fb3ae6..96699c87097 100644 --- a/ace/Shared_Memory_SV.i +++ b/ace/Shared_Memory_SV.i @@ -3,6 +3,8 @@ // Shared_Memory_SV.i +#include "ace/Global_Macros.h" + ACE_INLINE int ACE_Shared_Memory_SV::open (key_t id, int length, diff --git a/ace/Signal.h b/ace/Signal.h index 368b913cf9c..0d5f39fa63e 100644 --- a/ace/Signal.h +++ b/ace/Signal.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" #if defined (ACE_DONT_INCLUDE_ACE_SIGNAL_H) -# error ace/Signal.h was #included instead of signal.h by ace/OS.h: fix!!!! +# error ace/Signal.h was #included instead of signal.h by ace/OS_NS_signal.h: fix!!!! #endif /* ACE_DONT_INCLUDE_ACE_SIGNAL_H */ #include "ace/ACE_export.h" diff --git a/ace/Signal.i b/ace/Signal.i index e2ca95be130..908eb365b43 100644 --- a/ace/Signal.i +++ b/ace/Signal.i @@ -1,6 +1,8 @@ /* -*- C++ -*- */ // $Id$ +#include "ace/OS_NS_signal.h" + ACE_INLINE ACE_Sig_Set::ACE_Sig_Set (sigset_t *ss) // : sigset_ () diff --git a/ace/Singleton.h b/ace/Singleton.h index 818e93cbc8e..5e94ba1396b 100644 --- a/ace/Singleton.h +++ b/ace/Singleton.h @@ -23,7 +23,7 @@ #include "ace/config-all.h" #include "ace/TSS_T.h" -#include "ace/OS.h" // for ACE_Cleanup +#include "ace/Cleanup.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp index 4e4ae1844d6..fe5ac412f4a 100644 --- a/ace/Sock_Connect.cpp +++ b/ace/Sock_Connect.cpp @@ -1,12 +1,14 @@ // $Id$ #include "ace/Sock_Connect.h" -#include "ace/OS.h" // Needed to get the ifreq stuff #include "ace/INET_Addr.h" #include "ace/Log_Msg.h" #include "ace/Handle_Set.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/OS_NS_netdb.h" +#include "ace/os_include/net/os_if.h" # if defined (ACE_HAS_GETIFADDRS) # include /**/ <ifaddrs.h> diff --git a/ace/Stats.cpp b/ace/Stats.cpp index 0ca18fafcb8..766f831fcbb 100644 --- a/ace/Stats.cpp +++ b/ace/Stats.cpp @@ -1,12 +1,15 @@ // $Id$ #include "ace/Stats.h" -#include "ace/High_Res_Timer.h" #if !defined (__ACE_INLINE__) # include "ace/Stats.i" #endif /* __ACE_INLINE__ */ +#include "ace/High_Res_Timer.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" + ACE_RCSID(ace, Stats, "$Id$") ACE_UINT32 @@ -272,7 +275,7 @@ ACE_Stats::print_summary (const u_int precision, #if !defined (ACE_HAS_WINCE) ACE_OS::fprintf (file, ACE_LIB_TEXT ("ACE_Stats::print_summary: OVERFLOW: %s\n"), - strerror (overflow_)); + ACE_OS::strerror (overflow_)); #else // WinCE doesn't have strerror ;( ACE_OS::fprintf (file, diff --git a/ace/Stats.h b/ace/Stats.h index 79c3c31bc21..d228f8fa07f 100644 --- a/ace/Stats.h +++ b/ace/Stats.h @@ -25,7 +25,6 @@ #include "ace/Unbounded_Queue.h" #include "ace/Log_Msg.h" #include "ace/Basic_Stats.h" -#include "ace/OS.h" /** * @class ACE_Stats_Value diff --git a/ace/Stream_Modules.cpp b/ace/Stream_Modules.cpp index 71681344db7..6afe507f06b 100644 --- a/ace/Stream_Modules.cpp +++ b/ace/Stream_Modules.cpp @@ -5,6 +5,7 @@ #define ACE_STREAM_MODULES_C #include "ace/Stream_Modules.h" +#include "ace/OS_NS_string.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -142,7 +143,7 @@ ACE_Stream_Head<ACE_SYNCH_USE>::info (ACE_TCHAR **strp, size_t length) const return -1; else ACE_OS::strsncpy (*strp, name, length); - return ACE_static_cast (int, ACE_OS_String::strlen (name)); + return ACE_static_cast (int, ACE_OS::strlen (name)); } template <ACE_SYNCH_DECL> int @@ -285,7 +286,7 @@ ACE_Stream_Tail<ACE_SYNCH_USE>::info (ACE_TCHAR **strp, size_t length) const return -1; else ACE_OS::strsncpy (*strp, name, length); - return ACE_static_cast (int, ACE_OS_String::strlen (name)); + return ACE_static_cast (int, ACE_OS::strlen (name)); } template <ACE_SYNCH_DECL> int @@ -364,7 +365,7 @@ ACE_Thru_Task<ACE_SYNCH_USE>::info (ACE_TCHAR **strp, return -1; else ACE_OS::strsncpy (*strp, name, length); - return ACE_static_cast (int, ACE_OS_String::strlen (name)); + return ACE_static_cast (int, ACE_OS::strlen (name)); } template <ACE_SYNCH_DECL> int diff --git a/ace/String_Base.cpp b/ace/String_Base.cpp index e695b941e45..eb599426850 100644 --- a/ace/String_Base.cpp +++ b/ace/String_Base.cpp @@ -5,7 +5,7 @@ #include "ace/Malloc_Base.h" #include "ace/String_Base.h" #include "ace/Auto_Ptr.h" -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) #include "ace/String_Base.i" @@ -43,7 +43,7 @@ ACE_String_Base<CHAR>::set (const CHAR *s, this->buf_len_ = new_buf_len; this->release_ = 1; this->len_ = len; - ACE_OS_String::memcpy (this->rep_, s, len * sizeof (CHAR)); + ACE_OS::memcpy (this->rep_, s, len * sizeof (CHAR)); // NUL terminate. this->rep_[len] = '\0'; } @@ -77,7 +77,7 @@ ACE_String_Base<CHAR>::set (const CHAR *s, } else { - ACE_OS_String::memcpy (this->rep_, s, len * sizeof (CHAR)); + ACE_OS::memcpy (this->rep_, s, len * sizeof (CHAR)); // NUL terminate. this->rep_[len] = 0; this->len_ = len; @@ -126,7 +126,7 @@ ACE_String_Base<CHAR>::operator+= (const ACE_String_Base<CHAR> &s) // case 1. No memory allocation needed. if (this->buf_len_ >= new_buf_len) // Copy in data from new string. - ACE_OS_String::memcpy (this->rep_ + this->len_, + ACE_OS::memcpy (this->rep_ + this->len_, s.rep_, s.len_ * sizeof (CHAR)); // case 2. Memory reallocation is needed @@ -140,11 +140,11 @@ ACE_String_Base<CHAR>::operator+= (const ACE_String_Base<CHAR> &s) *this); // Copy memory from old string into new string. - ACE_OS_String::memcpy (t, + ACE_OS::memcpy (t, this->rep_, this->len_ * sizeof (CHAR)); - ACE_OS_String::memcpy (t + this->len_, + ACE_OS::memcpy (t + this->len_, s.rep_, s.len_ * sizeof (CHAR)); @@ -189,7 +189,7 @@ ACE_String_Base<CHAR>::resize (size_t len, CHAR c) } this->len_ = 0; - ACE_OS_String::memset (this->rep_, + ACE_OS::memset (this->rep_, c, this->buf_len_ * sizeof (CHAR)); } diff --git a/ace/String_Base.h b/ace/String_Base.h index a2430034fe2..b4afab07731 100644 --- a/ace/String_Base.h +++ b/ace/String_Base.h @@ -23,9 +23,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Global_Macros.h" -#include "ace/OS_String.h" -#include "ace/OS_Memory.h" - // Forward decl. class ACE_Allocator; diff --git a/ace/String_Base.i b/ace/String_Base.i index f35a1378bc4..af13ef5d50f 100644 --- a/ace/String_Base.i +++ b/ace/String_Base.i @@ -5,6 +5,8 @@ #include "ace/Malloc_Base.h" #include "ace/Min_Max.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_Memory.h" // Default constructor. @@ -35,7 +37,7 @@ ACE_String_Base<CHAR>::ACE_String_Base (const CHAR *s, size_t length; if (s != 0) - length = ACE_OS_String::strlen (s); + length = ACE_OS::strlen (s); else length = 0; @@ -146,7 +148,7 @@ ACE_String_Base<CHAR>::set (const CHAR *s, int release) { size_t length; if (s != 0) - length = ACE_OS_String::strlen (s); + length = ACE_OS::strlen (s); else length = 0; @@ -200,7 +202,7 @@ ACE_String_Base<CHAR>::rep (void) const CHAR *new_string; ACE_NEW_RETURN (new_string, CHAR[this->len_ + 1], 0); - ACE_OS_String::strsncpy (new_string, this->rep_, this->len_+1); + ACE_OS::strsncpy (new_string, this->rep_, this->len_+1); return new_string; } @@ -225,7 +227,7 @@ ACE_String_Base<CHAR>::compare (const ACE_String_Base<CHAR> &s) const // Pick smaller of the two lengths and perform the comparison. size_t smaller_length = ace_min (this->len_, s.len_); - int result = ACE_OS_String::memcmp (this->rep_, + int result = ACE_OS::memcmp (this->rep_, s.rep_, smaller_length * sizeof (CHAR)); @@ -277,8 +279,8 @@ template <class CHAR> ACE_INLINE ssize_t ACE_String_Base<CHAR>::find (const CHAR *s, size_t pos) const { CHAR *substr = this->rep_ + pos; - size_t len = ACE_OS_String::strlen (s); - CHAR *pointer = ACE_OS_String::strnstr (substr, s, len); + size_t len = ACE_OS::strlen (s); + CHAR *pointer = ACE_OS::strnstr (substr, s, len); if (pointer == 0) return ACE_String_Base<CHAR>::npos; else @@ -289,7 +291,7 @@ template <class CHAR> ACE_INLINE ssize_t ACE_String_Base<CHAR>::find (CHAR c, size_t pos) const { CHAR *substr = this->rep_ + pos; - CHAR *pointer = ACE_OS_String::strnchr (substr, c, this->len_ - pos); + CHAR *pointer = ACE_OS::strnchr (substr, c, this->len_ - pos); if (pointer == 0) return ACE_String_Base<CHAR>::npos; else diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp index f232996aca9..3ba3ed90846 100644 --- a/ace/Svc_Conf_l.cpp +++ b/ace/Svc_Conf_l.cpp @@ -20,7 +20,8 @@ #ifdef __cplusplus -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_ctype.h" #include "ace/Object_Manager.h" /* Use prototypes in function declarations. */ diff --git a/ace/Synch.h b/ace/Synch.h index dd6e8a3363a..c2983b85647 100644 --- a/ace/Synch.h +++ b/ace/Synch.h @@ -22,6 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if 0 + /* All the classes have been moved out into their own headers as part of the compile-time and footprint reduction effort. */ @@ -60,5 +62,7 @@ # include "ace/Test_and_Set.h" #endif /* ACE_LEGACY_MODE */ +#endif /* 0 */ + #include /**/ "ace/post.h" #endif /* ACE_SYNCH_H */ diff --git a/ace/System_Time.cpp b/ace/System_Time.cpp index 9e2f2b69380..125fa2f5050 100644 --- a/ace/System_Time.cpp +++ b/ace/System_Time.cpp @@ -2,6 +2,8 @@ // $Id$ #include "ace/System_Time.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_time.h" ACE_RCSID(ace, System_Time, "$Id$") diff --git a/ace/System_Time.h b/ace/System_Time.h index 242c944617c..906247bde0d 100644 --- a/ace/System_Time.h +++ b/ace/System_Time.h @@ -17,7 +17,7 @@ #define ACE_SYSTEM_TIME_H #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/TSS_T.cpp b/ace/TSS_T.cpp index 08cae3e52e0..c2cb22847c0 100644 --- a/ace/TSS_T.cpp +++ b/ace/TSS_T.cpp @@ -18,6 +18,7 @@ ACE_RCSID(ace, TSS_T, "$Id$") #include "ace/Thread.h" #include "ace/Log_Msg.h" #include "ace/Guard_T.h" +#include "ace/OS_NS_stdio.h" #if defined (ACE_HAS_THR_C_DEST) # include "ace/TSS_Adapter.h" diff --git a/ace/TTY_IO.cpp b/ace/TTY_IO.cpp index 8b7ae2bb74b..72f23e0e652 100644 --- a/ace/TTY_IO.cpp +++ b/ace/TTY_IO.cpp @@ -1,6 +1,9 @@ // $Id$ #include "ace/TTY_IO.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_strings.h" +#include "ace/os_include/os_termios.h" ACE_RCSID (ace, TTY_IO, diff --git a/ace/TTY_IO.h b/ace/TTY_IO.h index 8c26cc6e6af..f0fab47fe0b 100644 --- a/ace/TTY_IO.h +++ b/ace/TTY_IO.h @@ -13,14 +13,12 @@ #ifndef ACE_TTY_IO_H #define ACE_TTY_IO_H -#include "ace/OS.h" +#include "ace/DEV_IO.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/DEV_IO.h" - #if !defined (VMIN) #define ACE_VMIN 4 #else diff --git a/ace/Thread.h b/ace/Thread.h index 0763850eb85..0da56b10427 100644 --- a/ace/Thread.h +++ b/ace/Thread.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#include "ace/OS_NS_Thread.h" #include "ace/Thread_Adapter.h" struct cancel_state diff --git a/ace/Thread.i b/ace/Thread.i index 0a489f873b9..f12145ff040 100644 --- a/ace/Thread.i +++ b/ace/Thread.i @@ -3,6 +3,8 @@ // Thread.i +#include "ace/OS_NS_string.h" + // Allocates a <keyp> that is used to identify data that is specific // to each thread in the process. The key is global to all threads in // the process. diff --git a/ace/Thread_Adapter.cpp b/ace/Thread_Adapter.cpp index 0fef397baf2..3e2f3dfe9ea 100644 --- a/ace/Thread_Adapter.cpp +++ b/ace/Thread_Adapter.cpp @@ -1,7 +1,6 @@ // $Id$ #include "ace/Thread_Adapter.h" -#include "ace/OS.h" #include "ace/Thread_Manager.h" #include "ace/Thread_Exit.h" #include "ace/Thread_Hook.h" diff --git a/ace/Thread_Control.h b/ace/Thread_Control.h index 3448007fefe..fa2bc559c8d 100644 --- a/ace/Thread_Control.h +++ b/ace/Thread_Control.h @@ -20,10 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (ACE_LEGACY_MODE) -# include "ace/OS.h" -#endif /* ACE_LEGACY_MODE */ - class ACE_Thread_Manager; /** diff --git a/ace/Thread_Hook.cpp b/ace/Thread_Hook.cpp index 4d7a582f6c5..d0472c5fac7 100644 --- a/ace/Thread_Hook.cpp +++ b/ace/Thread_Hook.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Thread_Hook.h" -#include "ace/OS.h" +#include "ace/Object_Manager_Base.h" ACE_RCSID(ace, Thread_Hook, "$Id$") diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h index 049f8776181..e8be214ad66 100644 --- a/ace/Thread_Manager.h +++ b/ace/Thread_Manager.h @@ -29,6 +29,7 @@ #include "ace/Singleton.h" #include "ace/Log_Msg.h" #include "ace/Synch_Traits.h" +#include "ace/Basic_Types.h" // The following macros control how a Thread Manager manages a pool of // Thread_Descriptor. Currently, the default behavior is not to diff --git a/ace/Thread_Mutex.cpp b/ace/Thread_Mutex.cpp index 000c7f00bbb..0c7f3e45442 100644 --- a/ace/Thread_Mutex.cpp +++ b/ace/Thread_Mutex.cpp @@ -17,6 +17,8 @@ #include "ace/Thread_Mutex.inl" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" + ACE_RCSID(ace, Thread_Mutex, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Mutex_Guard) diff --git a/ace/Thread_Mutex.h b/ace/Thread_Mutex.h index dc6c1b52788..2c7f32bf7f5 100644 --- a/ace/Thread_Mutex.h +++ b/ace/Thread_Mutex.h @@ -28,7 +28,7 @@ // ACE platform supports some form of threading. #include "ace/ACE_export.h" -#include "ace/OS.h" +#include "ace/OS_NS_Thread.h" /** * @class ACE_Thread_Mutex diff --git a/ace/Time_Value.cpp b/ace/Time_Value.cpp index c8d81a1c5e9..603fe34ea17 100644 --- a/ace/Time_Value.cpp +++ b/ace/Time_Value.cpp @@ -201,6 +201,8 @@ ACE_Time_Value::normalize (void) } /*****************************************************************************/ +// These need to be moved to another file due unresolvable dependency +// issues with inlining. ACE_Countdown_Time::ACE_Countdown_Time (ACE_Time_Value *max_wait_time) : max_wait_time_ (max_wait_time), @@ -213,3 +215,53 @@ ACE_Countdown_Time::~ACE_Countdown_Time (void) { this->stop (); } + +/*****************************************************************************/ + +//ACE_INLINE +int +ACE_Countdown_Time::start (void) +{ + if (this->max_wait_time_ != 0) + { + this->start_time_ = ACE_OS::gettimeofday (); + this->stopped_ = 0; + } + return 0; +} + +//ACE_INLINE +int +ACE_Countdown_Time::stopped (void) const +{ + return stopped_; +} + +//ACE_INLINE +int +ACE_Countdown_Time::stop (void) +{ + if (this->max_wait_time_ != 0 && this->stopped_ == 0) + { + ACE_Time_Value elapsed_time = + ACE_OS::gettimeofday () - this->start_time_; + + if (*this->max_wait_time_ > elapsed_time) + *this->max_wait_time_ -= elapsed_time; + else + { + // Used all of timeout. + *this->max_wait_time_ = ACE_Time_Value::zero; + // errno = ETIME; + } + this->stopped_ = 1; + } + return 0; +} + +//ACE_INLINE +int +ACE_Countdown_Time::update (void) +{ + return this->stop () == 0 && this->start (); +} diff --git a/ace/Time_Value.inl b/ace/Time_Value.inl index d714308f88d..f41f0ee88f9 100644 --- a/ace/Time_Value.inl +++ b/ace/Time_Value.inl @@ -329,48 +329,3 @@ operator - (const ACE_Time_Value &tv1, return delta; } -/*****************************************************************************/ - -ACE_INLINE int -ACE_Countdown_Time::start (void) -{ - if (this->max_wait_time_ != 0) - { - this->start_time_ = ACE_OS::gettimeofday (); - this->stopped_ = 0; - } - return 0; -} - -ACE_INLINE int -ACE_Countdown_Time::stopped (void) const -{ - return stopped_; -} - -ACE_INLINE int -ACE_Countdown_Time::stop (void) -{ - if (this->max_wait_time_ != 0 && this->stopped_ == 0) - { - ACE_Time_Value elapsed_time = - ACE_OS::gettimeofday () - this->start_time_; - - if (*this->max_wait_time_ > elapsed_time) - *this->max_wait_time_ -= elapsed_time; - else - { - // Used all of timeout. - *this->max_wait_time_ = ACE_Time_Value::zero; - // errno = ETIME; - } - this->stopped_ = 1; - } - return 0; -} - -ACE_INLINE int -ACE_Countdown_Time::update (void) -{ - return this->stop () == 0 && this->start (); -} diff --git a/ace/Timeprobe.cpp b/ace/Timeprobe.cpp index b1edbf1b54e..1738da19618 100644 --- a/ace/Timeprobe.cpp +++ b/ace/Timeprobe.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/OS.h" +#include "ace/config-all.h" ACE_RCSID(ace, Timeprobe, "$Id$") diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h index 916b7dc55e8..243a8ffaa0c 100644 --- a/ace/Timeprobe.h +++ b/ace/Timeprobe.h @@ -40,7 +40,6 @@ #include /**/ "ace/pre.h" #include "ace/ACE_export.h" -#include "ace/OS.h" #include "ace/Malloc_Allocator.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/ace/Timeprobe_T.cpp b/ace/Timeprobe_T.cpp index a0491472234..8356e6e4296 100644 --- a/ace/Timeprobe_T.cpp +++ b/ace/Timeprobe_T.cpp @@ -3,7 +3,7 @@ #ifndef ACE_TIMEPROBE_T_C #define ACE_TIMEPROBE_T_C -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Timeprobe_T.h b/ace/Timeprobe_T.h index 599951fc43d..9867a540d02 100644 --- a/ace/Timeprobe_T.h +++ b/ace/Timeprobe_T.h @@ -14,7 +14,8 @@ #ifndef ACE_TIMEPROBE_T_H #define ACE_TIMEPROBE_T_H #include /**/ "ace/pre.h" -#include "ace/OS.h" + +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp index 5ef38cd70af..f3021edfd89 100644 --- a/ace/Timer_Heap_T.cpp +++ b/ace/Timer_Heap_T.cpp @@ -5,6 +5,7 @@ #include "ace/Timer_Heap_T.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp index 00d5723d80a..e1c9413f477 100644 --- a/ace/Timer_Queue_Adapters.cpp +++ b/ace/Timer_Queue_Adapters.cpp @@ -15,6 +15,8 @@ ACE_RCSID(ace, Timer_Queue_Adapters, "$Id$") # include "ace/Timer_Queue_Adapters.i" # endif /* __ACE_INLINE__ */ +#include "ace/OS_NS_unistd.h" + template <class TQ> TQ & ACE_Async_Timer_Queue_Adapter<TQ>::timer_queue (void) { diff --git a/ace/Timer_Queue_T.cpp b/ace/Timer_Queue_T.cpp index 6909c2ce9f2..7ab266d511b 100644 --- a/ace/Timer_Queue_T.cpp +++ b/ace/Timer_Queue_T.cpp @@ -14,6 +14,7 @@ #include "ace/Log_Msg.h" #include "ace/Reactor_Timer_Interface.h" #include "ace/Null_Mutex.h" +#include "ace/OS_NS_sys_time.h" #if !defined (__ACE_INLINE__) #include "ace/Timer_Queue_T.i" diff --git a/ace/Token.h b/ace/Token.h index fdc48ecc3ad..ef2ffb21acd 100644 --- a/ace/Token.h +++ b/ace/Token.h @@ -27,7 +27,6 @@ #if defined (ACE_HAS_THREADS) -#include "ace/OS.h" #include "ace/Thread_Mutex.h" #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || defined (VXWORKS) || defined (ACE_PSOS) diff --git a/ace/Token.i b/ace/Token.i index 4892f11b131..5cea9866cea 100644 --- a/ace/Token.i +++ b/ace/Token.i @@ -7,6 +7,8 @@ #if defined (ACE_HAS_THREADS) +#include "ace/Time_Value.h" + ACE_INLINE int ACE_Token::queueing_strategy (void) { diff --git a/ace/Trace.cpp b/ace/Trace.cpp index 25ad1d27022..5869f8bef45 100644 --- a/ace/Trace.cpp +++ b/ace/Trace.cpp @@ -14,7 +14,7 @@ ACE_RCSID (ace, #define ACE_NTRACE 1 #include "ace/Log_Msg.h" -#include "ace/OS.h" +#include "ace/Object_Manager_Base.h" // = Static initialization. diff --git a/ace/UNIX_Addr.i b/ace/UNIX_Addr.i index 2ef10e67556..d70ec1ffaa9 100644 --- a/ace/UNIX_Addr.i +++ b/ace/UNIX_Addr.i @@ -1,8 +1,11 @@ + /* -*- C++ -*- */ // $Id$ // UNIX_Addr.i +#include "ace/OS_NS_string.h" + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) // Return a pointer to the underlying address. diff --git a/ace/UUID.cpp b/ace/UUID.cpp index 7a846cee69f..8137d16bd60 100644 --- a/ace/UUID.cpp +++ b/ace/UUID.cpp @@ -1,12 +1,16 @@ //$Id$ -#include "ace/OS.h" -#include "ace/Log_Msg.h" + #include "ace/UUID.h" #if !defined (__ACE_INLINE__) #include "ace/UUID.inl" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_netdb.h" + ACE_RCSID (ace, UUID, "$Id$") diff --git a/ace/UUID.h b/ace/UUID.h index 631ac673eca..66bc291d785 100644 --- a/ace/UUID.h +++ b/ace/UUID.h @@ -14,7 +14,7 @@ #define ACE_UUID_H #include /**/ "ace/pre.h" -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/WIN32_Asynch_IO.h b/ace/WIN32_Asynch_IO.h index ee3e18c3716..b9d875164b1 100644 --- a/ace/WIN32_Asynch_IO.h +++ b/ace/WIN32_Asynch_IO.h @@ -34,7 +34,6 @@ #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) -#include "ace/OS.h" #include "ace/Asynch_IO_Impl.h" #include "ace/Addr.h" #include "ace/Event_Handler.h" diff --git a/ace/WIN32_Proactor.h b/ace/WIN32_Proactor.h index 56f2aab5e14..fef14f7f172 100644 --- a/ace/WIN32_Proactor.h +++ b/ace/WIN32_Proactor.h @@ -27,7 +27,6 @@ #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) // WIN32 implementation of the Proactor. -#include "ace/OS.h" #include "ace/WIN32_Asynch_IO.h" #include "ace/Event_Handler.h" diff --git a/ace/ace.mpc b/ace/ace.mpc index d03508545cd..d7d77717729 100644 --- a/ace/ace.mpc +++ b/ace/ace.mpc @@ -122,7 +122,22 @@ project(ACE) : acedefaults, aceversion, core, qt_moc, qt_reactor { Atomic_Op.cpp Process.cpp Process_Manager.cpp - Synch.cpp + //Synch.cpp + TSS_Adapter.cpp + Auto_Event.cpp + Manual_Event.cpp + Barrier.cpp + Condition_Thread_Mutex.cpp + Condition_Recursive_Thread_Mutex.cpp + Event.cpp + Lock.cpp + Mutex.cpp + RW_Mutex.cpp + RW_Thread_Mutex.cpp + Recursive_Thread_Mutex.cpp + Semaphore.cpp + Thread_Mutex.cpp + Thread_Semaphore.cpp Synch_Options.cpp Process_Semaphore.cpp Process_Mutex.cpp diff --git a/ace/config-all.h b/ace/config-all.h index e76ecf68ff6..9462bd35f08 100644 --- a/ace/config-all.h +++ b/ace/config-all.h @@ -699,6 +699,9 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \ # define ACE_NOTSUP do { errno = ENOTSUP; return; } while (0) #endif /* ! ACE_HAS_VERBOSE_NOTSUP */ +// empty ACE_OS namespace to help identify compiler errors more easily. +namespace ACE_OS {} + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_ALL_H */ diff --git a/ace/gethrtime.cpp b/ace/gethrtime.cpp index 08de489f7f6..b242ef2db27 100644 --- a/ace/gethrtime.cpp +++ b/ace/gethrtime.cpp @@ -5,7 +5,7 @@ // knew a way to correctly move values from registers to a 64-bit // variable in GHS asm code. That's easy with g++ asm. -#include "ace/OS.h" +#include "ace/config-all.h" ACE_RCSID(ace, gethrtime, "$Id$") diff --git a/ace/os_include/os_string.h b/ace/os_include/os_string.h index 3f4fff3814d..2af1d2901f8 100644 --- a/ace/os_include/os_string.h +++ b/ace/os_include/os_string.h @@ -64,12 +64,6 @@ extern "C" # define _strnicmp strnicmp #endif /* __BORLANDC__ */ -#if defined (ACE_HAS_CHARPTR_SPRINTF) -# define ACE_SPRINTF_ADAPTER(X) ::strlen (X) -#else -# define ACE_SPRINTF_ADAPTER(X) X -#endif /* ACE_HAS_CHARPTR_SPRINTF */ - #if defined (ACE_PSOS_SNARFS_HEADER_INFO) // Header information snarfed from compiler provided header files // that are not included because there is already an identically diff --git a/apps/Gateway/Gateway/Event.h b/apps/Gateway/Gateway/Event.h index fe4ae2c2272..0b83febc92c 100644 --- a/apps/Gateway/Gateway/Event.h +++ b/apps/Gateway/Gateway/Event.h @@ -17,12 +17,14 @@ #ifndef EVENT_H #define EVENT_H -#include "ace/OS.h" +#include "ace/os_include/arpa/os_inet.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Basic_Types.h" + // = The following #defines should really be in a separate include // file that is shared with the ../Peer/ directory. For now, we'll // keep them here to simplify the sharing between the two directories. diff --git a/apps/Gateway/Gateway/Event_Channel.cpp b/apps/Gateway/Gateway/Event_Channel.cpp index 350a72a4c16..f993869ed58 100644 --- a/apps/Gateway/Gateway/Event_Channel.cpp +++ b/apps/Gateway/Gateway/Event_Channel.cpp @@ -4,6 +4,7 @@ #include "Connection_Handler_Connector.h" #include "Event_Channel.h" +#include "ace/OS_NS_sys_select.h" ACE_RCSID(Gateway, Event_Channel, "$Id$") diff --git a/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h b/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h index 10bc4409589..2a83a53a584 100644 --- a/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h +++ b/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch.h" +#include "ace/Null_Mutex.h" #include "Event.h" #include "Consumer_Dispatch_Set.h" diff --git a/apps/Gateway/Gateway/File_Parser.cpp b/apps/Gateway/Gateway/File_Parser.cpp index 6f248e6762d..e108636a83e 100644 --- a/apps/Gateway/Gateway/File_Parser.cpp +++ b/apps/Gateway/Gateway/File_Parser.cpp @@ -4,7 +4,7 @@ #define FILE_PARSER_C -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/Gateway/Gateway/File_Parser.h b/apps/Gateway/Gateway/File_Parser.h index a91a8f75827..9b5033bf5a6 100644 --- a/apps/Gateway/Gateway/File_Parser.h +++ b/apps/Gateway/Gateway/File_Parser.h @@ -17,7 +17,7 @@ #ifndef _FILE_PARSER #define _FILE_PARSER -#include "ace/OS.h" +#include "ace/Basic_Types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/Gateway/Gateway/Gateway.h b/apps/Gateway/Gateway/Gateway.h index cd50cfa6e8e..fe7d138b3a1 100644 --- a/apps/Gateway/Gateway/Gateway.h +++ b/apps/Gateway/Gateway/Gateway.h @@ -22,7 +22,6 @@ #ifndef ACE_GATEWAY #define ACE_GATEWAY -#include "ace/OS.h" #include "ace/svc_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/apps/Gateway/Gateway/Options.cpp b/apps/Gateway/Gateway/Options.cpp index d13848835bf..b97f5aab784 100644 --- a/apps/Gateway/Gateway/Options.cpp +++ b/apps/Gateway/Gateway/Options.cpp @@ -6,6 +6,9 @@ #include "Options.h" #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_strings.h" +#include "ace/os_include/os_fcntl.h" ACE_RCSID(Gateway, Options, "$Id$") diff --git a/apps/Gateway/Gateway/Options.h b/apps/Gateway/Gateway/Options.h index 82bb7069c3a..c6913dd2310 100644 --- a/apps/Gateway/Gateway/Options.h +++ b/apps/Gateway/Gateway/Options.h @@ -24,6 +24,9 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/svc_export.h" +#include "ace/Lock_Adapter_T.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" class ACE_Svc_Export Options { diff --git a/apps/Gateway/Peer/Options.cpp b/apps/Gateway/Peer/Options.cpp index e4c5842c696..92dc6474a73 100644 --- a/apps/Gateway/Peer/Options.cpp +++ b/apps/Gateway/Peer/Options.cpp @@ -5,6 +5,8 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" #include "Options.h" +#include "ace/OS_NS_strings.h" +#include "ace/OS_NS_string.h" ACE_RCSID(Peer, Options, "$Id$") diff --git a/apps/JAWS/clients/Blobby/Blob.cpp b/apps/JAWS/clients/Blobby/Blob.cpp index 171fa0c34fe..e688241313b 100644 --- a/apps/JAWS/clients/Blobby/Blob.cpp +++ b/apps/JAWS/clients/Blobby/Blob.cpp @@ -19,7 +19,7 @@ ACE_Blob::~ACE_Blob (void) int ACE_Blob::open (ACE_TCHAR *filename, const ACE_TCHAR *hostname , u_short port) { - filename_ = ACE_OS_String::strdup (filename); + filename_ = ACE_OS::strdup (filename); inet_addr_.set (port, hostname); return 0; } diff --git a/apps/JAWS/clients/Blobby/Blob.h b/apps/JAWS/clients/Blobby/Blob.h index b2c078b0af2..afd880bf46c 100644 --- a/apps/JAWS/clients/Blobby/Blob.h +++ b/apps/JAWS/clients/Blobby/Blob.h @@ -21,7 +21,7 @@ #ifndef ACE_BLOB_H #define ACE_BLOB_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/apps/JAWS/clients/Blobby/Blob_Handler.cpp index 783736eb05f..005a8829539 100644 --- a/apps/JAWS/clients/Blobby/Blob_Handler.cpp +++ b/apps/JAWS/clients/Blobby/Blob_Handler.cpp @@ -1,6 +1,7 @@ // $Id$ #include "Blob_Handler.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(Blobby, Blob_Handler, "$Id$") @@ -17,7 +18,7 @@ ACE_Blob_Handler::ACE_Blob_Handler (ACE_Message_Block * mb, mb_ (mb), length_ (length), offset_ (offset), - filename_ (ACE_OS_String::strdup (filename)), + filename_ (ACE_OS::strdup (filename)), bytecount_ (0) { } @@ -96,9 +97,9 @@ ACE_Blob_Reader::send_request (void) char mesg [MAX_HEADER_SIZE]; // Check to see if the request is too big - if (MAX_HEADER_SIZE < (ACE_OS_String::strlen (request_prefix_) - + ACE_OS_String::strlen (filename_) - + ACE_OS_String::strlen (request_suffix_) + 4)) + if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_) + + ACE_OS::strlen (filename_) + + ACE_OS::strlen (request_suffix_) + 4)) ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1); // Create a message to send to the server requesting retrieval of the file diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.h b/apps/JAWS/clients/Blobby/Blob_Handler.h index b18df484ac5..41e13ff9c03 100644 --- a/apps/JAWS/clients/Blobby/Blob_Handler.h +++ b/apps/JAWS/clients/Blobby/Blob_Handler.h @@ -22,7 +22,7 @@ #ifndef ACE_BLOB_HANDLER_H #define ACE_BLOB_HANDLER_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/JAWS/clients/Blobby/blobby.cpp b/apps/JAWS/clients/Blobby/blobby.cpp index cb2067e083d..13f0f7dbd9a 100644 --- a/apps/JAWS/clients/Blobby/blobby.cpp +++ b/apps/JAWS/clients/Blobby/blobby.cpp @@ -23,6 +23,7 @@ //============================================================================ #include "Options.h" +#include "ace/OS_main.h" ACE_RCSID(Blobby, blobby, "$Id$") diff --git a/apps/JAWS/clients/Caching/URL_Properties.cpp b/apps/JAWS/clients/Caching/URL_Properties.cpp index eeae1f43581..40688bfe169 100644 --- a/apps/JAWS/clients/Caching/URL_Properties.cpp +++ b/apps/JAWS/clients/Caching/URL_Properties.cpp @@ -9,7 +9,6 @@ #include "URL_Properties.i" #endif /* __ACE_INLINE__ */ -#include "ace/OS.h" #include "ace/Auto_Ptr.h" #include "URL_Array_Helper.h" diff --git a/apps/JAWS/server/HTTP_Config.cpp b/apps/JAWS/server/HTTP_Config.cpp index ec67142c970..11890037d3c 100644 --- a/apps/JAWS/server/HTTP_Config.cpp +++ b/apps/JAWS/server/HTTP_Config.cpp @@ -2,7 +2,7 @@ // HTTP_Config.cpp -#include "ace/OS.h" +#include "ace/OS_NS_stdlib.h" #include "HTTP_Config.h" ACE_RCSID(server, HTTP_Config, "$Id$") diff --git a/apps/JAWS/server/HTTP_Handler.cpp b/apps/JAWS/server/HTTP_Handler.cpp index 30ddff2de1c..c90e7a11fa0 100644 --- a/apps/JAWS/server/HTTP_Handler.cpp +++ b/apps/JAWS/server/HTTP_Handler.cpp @@ -8,6 +8,8 @@ #include "HTTP_Handler.h" #include "HTTP_Helpers.h" #include "IO.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(server, HTTP_Handler, "$Id$") diff --git a/apps/JAWS/server/HTTP_Helpers.cpp b/apps/JAWS/server/HTTP_Helpers.cpp index 1ad58b96451..314e88985ac 100644 --- a/apps/JAWS/server/HTTP_Helpers.cpp +++ b/apps/JAWS/server/HTTP_Helpers.cpp @@ -4,6 +4,10 @@ #include "HTTP_Helpers.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/Guard_T.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(server, HTTP_Helpers, "$Id$") diff --git a/apps/JAWS/server/HTTP_Helpers.h b/apps/JAWS/server/HTTP_Helpers.h index 68f05729e48..e7d6eae4f42 100644 --- a/apps/JAWS/server/HTTP_Helpers.h +++ b/apps/JAWS/server/HTTP_Helpers.h @@ -18,7 +18,8 @@ #ifndef HTTP_HELPERS_H #define HTTP_HELPERS_H -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/JAWS/server/HTTP_Request.cpp b/apps/JAWS/server/HTTP_Request.cpp index 7140b7aa21a..970d9a82126 100644 --- a/apps/JAWS/server/HTTP_Request.cpp +++ b/apps/JAWS/server/HTTP_Request.cpp @@ -4,6 +4,9 @@ #include "HTTP_Request.h" #include "HTTP_Helpers.h" #include "HTTP_Config.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_pwd.h" +#include "ace/Log_Msg.h" ACE_RCSID(server, HTTP_Request, "$Id$") @@ -97,7 +100,7 @@ HTTP_Request::parse_request (ACE_Message_Block &mb) while (this->headers_.complete_header_line (mb.rd_ptr ()) > 0); } - mb.wr_ptr (strlen(mb.rd_ptr ()) - mb.length ()); + mb.wr_ptr (ACE_OS::strlen(mb.rd_ptr ()) - mb.length ()); if (this->headers_.end_of_headers () || (this->got_request_line () && this->version () == 0)) diff --git a/apps/JAWS/server/HTTP_Request.h b/apps/JAWS/server/HTTP_Request.h index 48dac56366c..3a3bed182fe 100644 --- a/apps/JAWS/server/HTTP_Request.h +++ b/apps/JAWS/server/HTTP_Request.h @@ -20,7 +20,7 @@ class ACE_Message_Block; -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/JAWS/server/HTTP_Response.cpp b/apps/JAWS/server/HTTP_Response.cpp index 2e401add738..50c14604253 100644 --- a/apps/JAWS/server/HTTP_Response.cpp +++ b/apps/JAWS/server/HTTP_Response.cpp @@ -3,6 +3,7 @@ #include "ace/Process.h" #include "ace/Mem_Map.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" #include "HTTP_Response.h" #include "HTTP_Request.h" diff --git a/apps/JAWS/server/HTTP_Server.h b/apps/JAWS/server/HTTP_Server.h index 8abb502e68a..3724dad6234 100644 --- a/apps/JAWS/server/HTTP_Server.h +++ b/apps/JAWS/server/HTTP_Server.h @@ -30,6 +30,9 @@ #include "ace/Asynch_IO.h" #include "ace/svc_export.h" #include "HTTP_Handler.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Null_Mutex.h" // Forward declaration. class ACE_Proactor; diff --git a/apps/JAWS/server/IO.cpp b/apps/JAWS/server/IO.cpp index b1f3eb3ec62..cd6d37b88e4 100644 --- a/apps/JAWS/server/IO.cpp +++ b/apps/JAWS/server/IO.cpp @@ -5,6 +5,7 @@ #include "ace/Filecache.h" #include "IO.h" #include "HTTP_Helpers.h" +#include "ace/OS_NS_sys_uio.h" ACE_RCSID(server, IO, "$Id$") diff --git a/apps/JAWS/server/Parse_Headers.cpp b/apps/JAWS/server/Parse_Headers.cpp index dc94b1354d9..0d7dd273c59 100644 --- a/apps/JAWS/server/Parse_Headers.cpp +++ b/apps/JAWS/server/Parse_Headers.cpp @@ -3,6 +3,10 @@ #include "ace/Log_Msg.h" #include "Parse_Headers.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_strings.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/os_include/os_ctype.h" ACE_RCSID(server, Parse_Headers, "$Id$") @@ -64,7 +68,7 @@ Headers::parse_header_line (char * const header_line) } // Write back the unused portion of the input. - ACE_OS::memmove (header_line, ptr, strlen(ptr) + 1); + ACE_OS::memmove (header_line, ptr, ACE_OS::strlen(ptr) + 1); } int diff --git a/apps/JAWS/server/Parse_Headers.h b/apps/JAWS/server/Parse_Headers.h index 68274bd442b..f5d564d8d0b 100644 --- a/apps/JAWS/server/Parse_Headers.h +++ b/apps/JAWS/server/Parse_Headers.h @@ -18,7 +18,7 @@ #ifndef PARSE_HEADERS_H #define PARSE_HEADERS_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/JAWS/server/main.cpp b/apps/JAWS/server/main.cpp index 0d04f565a06..4f319f02727 100644 --- a/apps/JAWS/server/main.cpp +++ b/apps/JAWS/server/main.cpp @@ -5,6 +5,8 @@ #include "ace/Filecache.h" #include "HTTP_Server.h" +#include "ace/OS_main.h" +#include "ace/OS_NS_signal.h" ACE_RCSID(server, main, "$Id$") diff --git a/apps/JAWS/stress_testing/global.h b/apps/JAWS/stress_testing/global.h index a0ec4a9757d..0d916f2cc41 100644 --- a/apps/JAWS/stress_testing/global.h +++ b/apps/JAWS/stress_testing/global.h @@ -6,7 +6,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" #include "ace/Pipe.h" diff --git a/apps/JAWS2/HTTPU/http_export.h b/apps/JAWS2/HTTPU/http_export.h index 84a819c8932..b0f6848cba2 100644 --- a/apps/JAWS2/HTTPU/http_export.h +++ b/apps/JAWS2/HTTPU/http_export.h @@ -7,7 +7,7 @@ #ifndef HTTPU_EXPORT_H #define HTTPU_EXPORT_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/JAWS2/HTTPU/parse_http_request.h b/apps/JAWS2/HTTPU/parse_http_request.h index 26c83348e37..43c2f954790 100644 --- a/apps/JAWS2/HTTPU/parse_http_request.h +++ b/apps/JAWS2/HTTPU/parse_http_request.h @@ -3,7 +3,7 @@ #ifndef HTTPU_PARSE_HTTP_REQUEST_H #define HTTPU_PARSE_HTTP_REQUEST_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/JAWS2/HTTPU/parse_http_response.cpp b/apps/JAWS2/HTTPU/parse_http_response.cpp index 4f20ac688d5..f3a195d1935 100644 --- a/apps/JAWS2/HTTPU/parse_http_response.cpp +++ b/apps/JAWS2/HTTPU/parse_http_response.cpp @@ -1,6 +1,8 @@ // $Id$ #include "HTTPU/parse_http_response.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdlib.h" Parse_HTTP_Response::Parse_HTTP_Response (const char *response) : code_ (200), diff --git a/apps/JAWS2/HTTPU/parse_http_response.h b/apps/JAWS2/HTTPU/parse_http_response.h index 42fd5a31afe..58f126f654a 100644 --- a/apps/JAWS2/HTTPU/parse_http_response.h +++ b/apps/JAWS2/HTTPU/parse_http_response.h @@ -3,7 +3,7 @@ #ifndef HTTPU_PARSE_HTTP_RESPONSE_H #define HTTPU_PARSE_HTTP_RESPONSE_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/JAWS2/HTTPU/parse_url.cpp b/apps/JAWS2/HTTPU/parse_url.cpp index 2c998c7083a..c1c753d0784 100644 --- a/apps/JAWS2/HTTPU/parse_url.cpp +++ b/apps/JAWS2/HTTPU/parse_url.cpp @@ -1,6 +1,7 @@ // $Id$ -#include "ace/OS.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdlib.h" #include "ace/Log_Msg.h" #include "HTTPU/parse_url.h" diff --git a/apps/JAWS2/HTTP_10_Write.cpp b/apps/JAWS2/HTTP_10_Write.cpp index e22bfef849b..16bf3f56d9e 100644 --- a/apps/JAWS2/HTTP_10_Write.cpp +++ b/apps/JAWS2/HTTP_10_Write.cpp @@ -1,7 +1,5 @@ // $Id$ -#include "ace/OS.h" - #include "JAWS/JAWS.h" #include "JAWS/IO.h" #include "JAWS/IO_Handler.h" diff --git a/apps/JAWS2/JAWS/Cache_Hash_T.h b/apps/JAWS2/JAWS/Cache_Hash_T.h index 2d310873cb2..f5f050c3801 100644 --- a/apps/JAWS2/JAWS/Cache_Hash_T.h +++ b/apps/JAWS2/JAWS/Cache_Hash_T.h @@ -4,7 +4,6 @@ #ifndef JAWS_CACHE_HASH_T_H #define JAWS_CACHE_HASH_T_H -#include "ace/OS.h" #include "JAWS/Cache_Object.h" // Forward declaration diff --git a/apps/JAWS2/JAWS/Cache_Manager.cpp b/apps/JAWS2/JAWS/Cache_Manager.cpp index a91ac38375a..7abbcfaf020 100644 --- a/apps/JAWS2/JAWS/Cache_Manager.cpp +++ b/apps/JAWS2/JAWS/Cache_Manager.cpp @@ -1,8 +1,6 @@ // $Id$ -#include "ace/OS.h" #include "ace/ACE.h" -#include "ace/Synch.h" #include "JAWS/Cache_Manager.h" #include "JAWS/Cache_List_T.h" diff --git a/apps/JAWS2/JAWS/Cache_Manager.h b/apps/JAWS2/JAWS/Cache_Manager.h index 723e6729f33..c7837b935ba 100644 --- a/apps/JAWS2/JAWS/Cache_Manager.h +++ b/apps/JAWS2/JAWS/Cache_Manager.h @@ -4,9 +4,7 @@ #ifndef JAWS_CACHE_MANAGER_H #define JAWS_CACHE_MANAGER_H -#include "ace/OS.h" #include "ace/ACE.h" -#include "ace/Synch.h" #include "JAWS/Cache_Manager_T.h" diff --git a/apps/JAWS2/JAWS/Cache_Object.cpp b/apps/JAWS2/JAWS/Cache_Object.cpp index abb582aa9c7..bb1a258ef2d 100644 --- a/apps/JAWS2/JAWS/Cache_Object.cpp +++ b/apps/JAWS2/JAWS/Cache_Object.cpp @@ -1,6 +1,7 @@ // $Id$ #include "JAWS/Cache_Object.h" +#include "ace/OS_NS_time.h" JAWS_Cache_Object::JAWS_Cache_Object (const void *data, size_t size) : internal_ (0), diff --git a/apps/JAWS2/JAWS/Cache_Object.h b/apps/JAWS2/JAWS/Cache_Object.h index fbd570b4140..96a9cfa096c 100644 --- a/apps/JAWS2/JAWS/Cache_Object.h +++ b/apps/JAWS2/JAWS/Cache_Object.h @@ -5,8 +5,9 @@ #ifndef JAWS_CACHE_OBJECT_H #define JAWS_CACHE_OBJECT_H -#include "ace/OS.h" -#include "ace/Synch.h" +#include "ace/Lock_Adapter_T.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" #include "ace/Malloc.h" // Cache bucket -- use Hash_Bucket to hold cacheable objects. diff --git a/apps/JAWS2/JAWS/Export.h b/apps/JAWS2/JAWS/Export.h index f06afcdb767..432b23f6984 100644 --- a/apps/JAWS2/JAWS/Export.h +++ b/apps/JAWS2/JAWS/Export.h @@ -7,7 +7,7 @@ #ifndef JAWS_EXPORT_H #define JAWS_EXPORT_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/JAWS2/JAWS/FILE.cpp b/apps/JAWS2/JAWS/FILE.cpp index 1394b7f1696..3f01f368a88 100644 --- a/apps/JAWS2/JAWS/FILE.cpp +++ b/apps/JAWS2/JAWS/FILE.cpp @@ -1,7 +1,6 @@ // $Id$ -#include "ace/OS.h" -#include "ace/Synch.h" +#include "ace/Guard_T.h" #include "JAWS/FILE.h" diff --git a/apps/JAWS2/JAWS/FILE.h b/apps/JAWS2/JAWS/FILE.h index 527227f85e2..478f3271e31 100644 --- a/apps/JAWS2/JAWS/FILE.h +++ b/apps/JAWS2/JAWS/FILE.h @@ -9,6 +9,8 @@ #include "ace/Mem_Map.h" #include "JAWS/Export.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" class JAWS_Export JAWS_FILE : public ACE_FILE_IO // diff --git a/apps/JAWS2/JAWS/Filecache.cpp b/apps/JAWS2/JAWS/Filecache.cpp index a6791538921..d551542d59c 100644 --- a/apps/JAWS2/JAWS/Filecache.cpp +++ b/apps/JAWS2/JAWS/Filecache.cpp @@ -1,6 +1,5 @@ // $Id$ -#include "ace/OS.h" #include "ace/FILE_Connector.h" #include "JAWS/Filecache.h" diff --git a/apps/JAWS2/JAWS/Filecache.h b/apps/JAWS2/JAWS/Filecache.h index a770f1fd959..7ea313a43b1 100644 --- a/apps/JAWS2/JAWS/Filecache.h +++ b/apps/JAWS2/JAWS/Filecache.h @@ -4,7 +4,6 @@ #ifndef JAWS_FILECACHE_H #define JAWS_FILECACHE_H -#include "ace/OS.h" #include "ace/FILE_IO.h" #include "JAWS/Cache_Manager.h" diff --git a/apps/JAWS2/JAWS/Headers.cpp b/apps/JAWS2/JAWS/Headers.cpp index b41ddd87ff5..3e7d2b3018b 100644 --- a/apps/JAWS2/JAWS/Headers.cpp +++ b/apps/JAWS2/JAWS/Headers.cpp @@ -1,6 +1,7 @@ /* $Id$ */ #include "JAWS/Headers.h" +#include "ace/OS_NS_strings.h" // Header Data diff --git a/apps/drwho/BS_Client.cpp b/apps/drwho/BS_Client.cpp index ec6ae351632..95f2ea940d7 100644 --- a/apps/drwho/BS_Client.cpp +++ b/apps/drwho/BS_Client.cpp @@ -5,6 +5,7 @@ #include "BS_Client.h" #include "ace/Log_Msg.h" #include "ace/Null_Mutex.h" +#include "ace/OS_NS_string.h" BS_Client::BS_Client (void) { diff --git a/apps/drwho/BS_Server.cpp b/apps/drwho/BS_Server.cpp index bddaa5a31aa..22d2c77d3ff 100644 --- a/apps/drwho/BS_Server.cpp +++ b/apps/drwho/BS_Server.cpp @@ -1,6 +1,9 @@ // $Id$ #include "BS_Server.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_Memory.h" // This constructor takes a message of sorted login names and loads up // the symbol table on the server's side. It assumes that the number diff --git a/apps/drwho/Binary_Search.cpp b/apps/drwho/Binary_Search.cpp index 54582052629..b4c39de27be 100644 --- a/apps/drwho/Binary_Search.cpp +++ b/apps/drwho/Binary_Search.cpp @@ -3,6 +3,7 @@ #include "Options.h" #include "Binary_Search.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" // This function is passed to qsort to perform the comparison between // login names for two friends. diff --git a/apps/drwho/CM_Client.cpp b/apps/drwho/CM_Client.cpp index 8bdc9cec179..e24e9866503 100644 --- a/apps/drwho/CM_Client.cpp +++ b/apps/drwho/CM_Client.cpp @@ -4,6 +4,11 @@ #include "Multicast_Manager.h" #include "CM_Client.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/OS_NS_sys_select.h" +#include "ace/OS_NS_netdb.h" +#include "ace/OS_NS_arpa_inet.h" // Creates and binds a UDP socket... @@ -68,7 +73,7 @@ CM_Client::receive (int timeout) ACE_DEBUG ((LM_DEBUG, "receiving from server host %s (%s)\n", np->h_name, - inet_ntoa (this->sin_.sin_addr))); + ACE_OS::inet_ntoa (this->sin_.sin_addr))); } if (this->demux (this->recv_packet_, n) < 0) diff --git a/apps/drwho/CM_Client.h b/apps/drwho/CM_Client.h index 1e789633a5a..43d3e9e940e 100644 --- a/apps/drwho/CM_Client.h +++ b/apps/drwho/CM_Client.h @@ -22,6 +22,7 @@ #define _CM_CLIENT_H #include "Comm_Manager.h" +#include "ace/Time_Value.h" class CM_Client : public Comm_Manager { diff --git a/apps/drwho/CM_Server.cpp b/apps/drwho/CM_Server.cpp index 0cf6b9b9df2..16a7bcfe07b 100644 --- a/apps/drwho/CM_Server.cpp +++ b/apps/drwho/CM_Server.cpp @@ -5,6 +5,9 @@ #include "CM_Server.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/OS_NS_arpa_inet.h" // Creates and binds a UDP socket... diff --git a/apps/drwho/Comm_Manager.h b/apps/drwho/Comm_Manager.h index ec3caf93e74..f0f05d454c2 100644 --- a/apps/drwho/Comm_Manager.h +++ b/apps/drwho/Comm_Manager.h @@ -18,6 +18,7 @@ #define _COMM_MANAGER_H #include "global.h" +#include "ace/os_include/netinet/os_in.h" class Comm_Manager { diff --git a/apps/drwho/File_Manager.cpp b/apps/drwho/File_Manager.cpp index bca426b824f..ff731e54e48 100644 --- a/apps/drwho/File_Manager.cpp +++ b/apps/drwho/File_Manager.cpp @@ -1,6 +1,9 @@ // $Id$ #include "File_Manager.h" +#include "ace/OS_NS_pwd.h" +#include "ace/OS_NS_string.h" +#include "ace/os_include/os_ctype.h" File_Manager::File_Manager (void) : number_of_friends (0), @@ -81,7 +84,7 @@ File_Manager::open_passwd_file (void) (pwent = ACE_OS::getpwent ()) != 0; ) if (*pwent->pw_gecos != '\0') { - char *cp = strchr (pwent->pw_gecos, ','); + char *cp = ACE_OS::strchr (pwent->pw_gecos, ','); if (cp != 0) *cp = '\0'; diff --git a/apps/drwho/HT_Client.cpp b/apps/drwho/HT_Client.cpp index 0ff9674cf93..8854919fd73 100644 --- a/apps/drwho/HT_Client.cpp +++ b/apps/drwho/HT_Client.cpp @@ -2,6 +2,7 @@ #include "HT_Client.h" #include "ace/ACE.h" +#include "ace/OS_NS_string.h" // Insert a KEY_NAME into the hash table, if it doesn't already exist // there. What gets returned is a pointer to the node inserted. Note diff --git a/apps/drwho/HT_Server.cpp b/apps/drwho/HT_Server.cpp index 5af2b21c4b5..ff61a2876fe 100644 --- a/apps/drwho/HT_Server.cpp +++ b/apps/drwho/HT_Server.cpp @@ -2,6 +2,7 @@ #include "HT_Server.h" #include "ace/ACE.h" +#include "ace/OS_NS_string.h" // Insert a KEY_NAME into the hash table, if it doesn't already exist // there. What gets returned is a pointer to the node inserted. Note @@ -15,7 +16,7 @@ HT_Server::insert (const char *key_name, int max_len) // This is tricky... for (prpp = &this->hash_table[ACE::hash_pjw (key_name) % this->hash_table_size]; - *prpp != 0 && strncmp ((*prpp)->get_login (), key_name, max_len) != 0; + *prpp != 0 && ACE_OS::strncmp ((*prpp)->get_login (), key_name, max_len) != 0; prpp = &(*prpp)->next_) continue; diff --git a/apps/drwho/Hash_Table.cpp b/apps/drwho/Hash_Table.cpp index 51fba821db9..574cb71718b 100644 --- a/apps/drwho/Hash_Table.cpp +++ b/apps/drwho/Hash_Table.cpp @@ -3,6 +3,8 @@ #include "Options.h" #include "Hash_Table.h" #include "ace/Log_Msg.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_string.h" Hash_Table::Hash_Table (void) : current_ptr (0), diff --git a/apps/drwho/Multicast_Manager.cpp b/apps/drwho/Multicast_Manager.cpp index f213a65846e..71bb56ee894 100644 --- a/apps/drwho/Multicast_Manager.cpp +++ b/apps/drwho/Multicast_Manager.cpp @@ -3,6 +3,11 @@ #include "Multicast_Manager.h" #include "ace/Mem_Map.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_arpa_inet.h" +#include "ace/OS_NS_netdb.h" +#include "ace/OS_Memory.h" +#include "ace/os_include/os_ctype.h" // Initialize all the static member vars. int Multicast_Manager::received_host_count = 0; @@ -118,7 +123,7 @@ Multicast_Manager::get_host_entry (const char *host) hp = ACE_OS::gethostbyname (host); - return hp == 0 ? 0 : (hostent *) memcpy (&host_entry, hp, sizeof *hp); + return hp == 0 ? 0 : (hostent *) ACE_OS::memcpy (&host_entry, hp, sizeof *hp); } // Adds an additional new host to the list of host machines. diff --git a/apps/drwho/Multicast_Manager.h b/apps/drwho/Multicast_Manager.h index 82f609a6546..ee21ac6ac08 100644 --- a/apps/drwho/Multicast_Manager.h +++ b/apps/drwho/Multicast_Manager.h @@ -18,6 +18,8 @@ #define _MULTICAST_MANAGER_H #include "global.h" +#include "ace/os_include/netinet/os_in.h" +#include "ace/os_include/os_netdb.h" class Host_Elem { diff --git a/apps/drwho/Options.h b/apps/drwho/Options.h index 567c91a49f6..bfc9d054c43 100644 --- a/apps/drwho/Options.h +++ b/apps/drwho/Options.h @@ -60,7 +60,7 @@ public: static char *user_name; static void print_usage_and_die (int long_msg); - static u_int option_word; + static unsigned int option_word; }; #endif /* _OPTIONS_H */ diff --git a/apps/drwho/PMC_All.cpp b/apps/drwho/PMC_All.cpp index 2f599150785..8a77182fd0a 100644 --- a/apps/drwho/PMC_All.cpp +++ b/apps/drwho/PMC_All.cpp @@ -6,6 +6,7 @@ #include "PMC_All.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" // This function is pretty much a no-op that just sets up the // appropriate lookup function to use. diff --git a/apps/drwho/PMC_Flo.cpp b/apps/drwho/PMC_Flo.cpp index 72758191d00..58105822e55 100644 --- a/apps/drwho/PMC_Flo.cpp +++ b/apps/drwho/PMC_Flo.cpp @@ -5,6 +5,7 @@ #include "PMC_Flo.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" // This function "encodes" a list of friends by putting the userid's // in a contiguous block. This block can then be transmitted over to diff --git a/apps/drwho/PMC_Ruser.cpp b/apps/drwho/PMC_Ruser.cpp index f32b13a7bc2..9b9f3ff6f63 100644 --- a/apps/drwho/PMC_Ruser.cpp +++ b/apps/drwho/PMC_Ruser.cpp @@ -6,6 +6,7 @@ #include "PMC_Ruser.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" // This function is pretty much a no-op that just sets up the // appropriate lookup function to use. diff --git a/apps/drwho/PMC_Usr.cpp b/apps/drwho/PMC_Usr.cpp index c406e3e9d16..ca781b74848 100644 --- a/apps/drwho/PMC_Usr.cpp +++ b/apps/drwho/PMC_Usr.cpp @@ -5,6 +5,7 @@ #include "PMC_Usr.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" int PMC_Usr::encode (char *packet, int &packet_length) diff --git a/apps/drwho/PMS_All.cpp b/apps/drwho/PMS_All.cpp index a942b498273..e51e7701931 100644 --- a/apps/drwho/PMS_All.cpp +++ b/apps/drwho/PMS_All.cpp @@ -5,6 +5,8 @@ #include "PMS_All.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_pwd.h" // This function packs the located friends userids, plus the machines // they are logged into (along with the inactive and active counts on @@ -80,7 +82,7 @@ Protocol_Record * PMS_All::insert_protocol_info (Protocol_Record &protocol_record) { Protocol_Record *prp = PM_Server::insert_protocol_info (protocol_record); - passwd *pwent = getpwnam (prp->get_login ()); + passwd *pwent = ACE_OS::getpwnam (prp->get_login ()); char *cp = (char *) ACE_OS::strchr (prp->set_real (pwent == 0 ? prp->get_login () : diff --git a/apps/drwho/PMS_Flo.cpp b/apps/drwho/PMS_Flo.cpp index 2fecac44057..291884b18cf 100644 --- a/apps/drwho/PMS_Flo.cpp +++ b/apps/drwho/PMS_Flo.cpp @@ -5,6 +5,7 @@ #include "PMS_Flo.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" // This function packs the located friends userids, plus the machines // they are logged into (along with the inactive and active counts on diff --git a/apps/drwho/PMS_Ruser.cpp b/apps/drwho/PMS_Ruser.cpp index 0f4288a868b..062cf80471f 100644 --- a/apps/drwho/PMS_Ruser.cpp +++ b/apps/drwho/PMS_Ruser.cpp @@ -5,6 +5,8 @@ #include "PMS_Ruser.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_pwd.h" // This function packs the located friends userids, plus the machines // they are logged into (along with the inactive and active counts on @@ -86,7 +88,7 @@ PMS_Ruser::insert_protocol_info (Protocol_Record &protocol_record) np->set_real_name (""); else { - passwd *pwent = getpwnam (np->get_login_name ()); + passwd *pwent = ACE_OS::getpwnam (np->get_login_name ()); char *cp = (char *) ACE_OS::strchr (np->set_real_name (pwent == 0 ? np->get_login_name () diff --git a/apps/drwho/PMS_Usr.cpp b/apps/drwho/PMS_Usr.cpp index 6c1138734ca..636967f59d4 100644 --- a/apps/drwho/PMS_Usr.cpp +++ b/apps/drwho/PMS_Usr.cpp @@ -5,6 +5,7 @@ #include "PMS_Usr.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" // This function "encodes" a list of friends by putting the userid's in // a contiguous block. This block can then be transmitted over to the diff --git a/apps/drwho/PM_Client.cpp b/apps/drwho/PM_Client.cpp index 44476007dc4..cffa91719fa 100644 --- a/apps/drwho/PM_Client.cpp +++ b/apps/drwho/PM_Client.cpp @@ -5,6 +5,7 @@ #include "PM_Client.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" // This function is used to merge the LOGIN_NAME from server HOST_NAME // into the userids kept on the client's side. Note that we must diff --git a/apps/drwho/PM_Server.cpp b/apps/drwho/PM_Server.cpp index 0b946f5cca9..88a32b586c6 100644 --- a/apps/drwho/PM_Server.cpp +++ b/apps/drwho/PM_Server.cpp @@ -4,6 +4,7 @@ #include "Rwho_DB_Manager.h" #include "PM_Server.h" #include "ace/ACE.h" +#include "ace/OS_NS_string.h" // This is the main method for the server side of things. It reads // the RWHO file on the local machine and inserts HOST_NAME @@ -67,7 +68,7 @@ PM_Server::handle_protocol_entries (char *buf_ptr, np->get_inactive_count (), np->get_active_count (), np->get_host_name ()); - buf_ptr += strlen (buf_ptr) + 1; + buf_ptr += ACE_OS::strlen (buf_ptr) + 1; } return buf_ptr; diff --git a/apps/drwho/Protocol_Manager.cpp b/apps/drwho/Protocol_Manager.cpp index 9545d7ee341..faf118ef169 100644 --- a/apps/drwho/Protocol_Manager.cpp +++ b/apps/drwho/Protocol_Manager.cpp @@ -2,6 +2,8 @@ #include "ace/config.h" #include "ace/Log_Msg.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_string.h" #include "Options.h" #include "Protocol_Manager.h" diff --git a/apps/drwho/Protocol_Manager.h b/apps/drwho/Protocol_Manager.h index d61e752c8df..fd4ef92a9ed 100644 --- a/apps/drwho/Protocol_Manager.h +++ b/apps/drwho/Protocol_Manager.h @@ -17,7 +17,7 @@ #ifndef _PROTOCOL_MANAGER_H #define _PROTOCOL_MANAGER_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/drwho/Rwho_DB_Manager.cpp b/apps/drwho/Rwho_DB_Manager.cpp index 52cf4fb0faa..cd437bfd407 100644 --- a/apps/drwho/Rwho_DB_Manager.cpp +++ b/apps/drwho/Rwho_DB_Manager.cpp @@ -3,6 +3,9 @@ #include "Options.h" #include "Rwho_DB_Manager.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_fcntl.h" // Change to the RWHO directory to speed up and simplify later // processing. This requires opening the directory for reading with diff --git a/apps/drwho/SL_Server.cpp b/apps/drwho/SL_Server.cpp index 35c29d598dc..7dc172deb08 100644 --- a/apps/drwho/SL_Server.cpp +++ b/apps/drwho/SL_Server.cpp @@ -2,6 +2,7 @@ #include "global.h" #include "SL_Server.h" +#include "ace/OS_NS_string.h" SL_Server::SL_Server (const char *usr_name) : Single_Lookup (usr_name) diff --git a/apps/drwho/SM_Client.cpp b/apps/drwho/SM_Client.cpp index 48bca11b7e3..02e552c9af9 100644 --- a/apps/drwho/SM_Client.cpp +++ b/apps/drwho/SM_Client.cpp @@ -7,6 +7,7 @@ #include "PMC_Ruser.h" #include "SM_Client.h" #include "ace/Log_Msg.h" +#include "ace/OS_Memory.h" // Call-back function that invokes the appropriate decode function. diff --git a/apps/drwho/SM_Server.cpp b/apps/drwho/SM_Server.cpp index 74229921845..25a43375524 100644 --- a/apps/drwho/SM_Server.cpp +++ b/apps/drwho/SM_Server.cpp @@ -7,6 +7,7 @@ #include "PMS_Ruser.h" #include "SM_Server.h" #include "ace/Log_Msg.h" +#include "ace/OS_Memory.h" int SM_Server::demux (char *packet, int &packet_length) diff --git a/apps/drwho/client.cpp b/apps/drwho/client.cpp index 3a66b3ac9b5..5b8f4fcf8ab 100644 --- a/apps/drwho/client.cpp +++ b/apps/drwho/client.cpp @@ -21,6 +21,7 @@ #include "Options.h" #include "SML_Client.h" #include "SMR_Client.h" +#include "ace/OS_Memory.h" // Factory function. diff --git a/apps/drwho/global.h b/apps/drwho/global.h index d049bd3f43d..c6713f0063e 100644 --- a/apps/drwho/global.h +++ b/apps/drwho/global.h @@ -20,7 +20,7 @@ #ifndef _GLOBAL_H #define _GLOBAL_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/drwho/server.cpp b/apps/drwho/server.cpp index 41f005354c7..db2766d0d75 100644 --- a/apps/drwho/server.cpp +++ b/apps/drwho/server.cpp @@ -23,6 +23,9 @@ #include "SMR_Server.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_signal.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_sys_socket.h" static char * time_stamp (void) diff --git a/apps/gperf/src/Bool_Array.cpp b/apps/gperf/src/Bool_Array.cpp index 718d997b456..668f0cd0016 100644 --- a/apps/gperf/src/Bool_Array.cpp +++ b/apps/gperf/src/Bool_Array.cpp @@ -24,12 +24,14 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Bool_Array.h" -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" ACE_RCSID(src, Bool_Array, "$Id$") #if defined (ACE_HAS_GPERF) +#include "ace/OS_Memory.h" + // Prints out debugging diagnostics. Bool_Array::~Bool_Array (void) @@ -60,7 +62,7 @@ Bool_Array::open (u_long s) u_long[s], -1); - ACE_OS_String::memset (storage_array_, + ACE_OS::memset (storage_array_, 0, s * sizeof *storage_array_); @@ -94,9 +96,9 @@ Bool_Array::reset (void) "(re-initializing bool_array)...")); this->generation_number_ = 1; - ACE_OS_String::memset (storage_array_, - 0, - size_ * sizeof *storage_array_); + ACE_OS::memset (storage_array_, + 0, + size_ * sizeof *storage_array_); if (option[DEBUGGING]) ACE_DEBUG ((LM_DEBUG, "done\n")); diff --git a/apps/gperf/src/Gen_Perf.cpp b/apps/gperf/src/Gen_Perf.cpp index 60202b4edc5..da925e89b63 100644 --- a/apps/gperf/src/Gen_Perf.cpp +++ b/apps/gperf/src/Gen_Perf.cpp @@ -28,6 +28,9 @@ ACE_RCSID(src, Gen_Perf, "$Id$") #if defined (ACE_HAS_GPERF) #include "Vectors.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_Memory.h" // Current release version. extern const char *version_string; diff --git a/apps/gperf/src/Hash_Table.cpp b/apps/gperf/src/Hash_Table.cpp index 179bb17f502..f25f3b9bef7 100644 --- a/apps/gperf/src/Hash_Table.cpp +++ b/apps/gperf/src/Hash_Table.cpp @@ -28,6 +28,7 @@ ACE_RCSID(src, Hash_Table, "$Id$") #if defined (ACE_HAS_GPERF) #include "ace/ACE.h" +#include "ace/OS_NS_string.h" // The size of the hash table is always the smallest power of 2 >= the // size indicated by the user. This allows several optimizations, diff --git a/apps/gperf/src/Hash_Table.h b/apps/gperf/src/Hash_Table.h index dba0c478eff..d8385858271 100644 --- a/apps/gperf/src/Hash_Table.h +++ b/apps/gperf/src/Hash_Table.h @@ -24,7 +24,7 @@ #ifndef HASH_TABLE_H #define HASH_TABLE_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/gperf/src/Iterator.cpp b/apps/gperf/src/Iterator.cpp index 75d6e40ddef..4e3c86318d1 100644 --- a/apps/gperf/src/Iterator.cpp +++ b/apps/gperf/src/Iterator.cpp @@ -27,6 +27,8 @@ ACE_RCSID(src, Iterator, "$Id$") #if defined (ACE_HAS_GPERF) +#include "ace/os_include/os_ctype.h" + // Constructor for Iterator. Iterator::Iterator (char *s, diff --git a/apps/gperf/src/Key_List.cpp b/apps/gperf/src/Key_List.cpp index 3c17802f7ae..dceb489f28b 100644 --- a/apps/gperf/src/Key_List.cpp +++ b/apps/gperf/src/Key_List.cpp @@ -29,6 +29,9 @@ ACE_RCSID(src, Key_List, "$Id$") #include "ace/Read_Buffer.h" #include "Hash_Table.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" // Default type for generated code. const char *const Key_List::default_array_type = "char *"; @@ -362,7 +365,7 @@ Key_List::merge (List_Node *list1, List_Node *list2) return list1; else if (occurrence_sort && list1->occurrence < list2->occurrence || hash_sort && list1->hash_value > list2->hash_value - || key_sort && strcmp (list1->key, list2->key) >= 0) + || key_sort && ACE_OS::strcmp (list1->key, list2->key) >= 0) { list2->next = merge (list2->next, list1); return list2; @@ -553,7 +556,7 @@ Key_List::output_switch (int use_keyword_table) // Keep track of the longest string we'll need! const char *s = "charmap[*str] == *resword->%s && !strncasecmp (str + 1, resword->%s + 1, len - 1)"; comp_buffer = - new char [strlen (s) + 2 * strlen (option.key_name ()) + 1]; + new char [ACE_OS::strlen (s) + 2 * ACE_OS::strlen (option.key_name ()) + 1]; if (option[COMP]) sprintf (comp_buffer, "%s == *resword->%s && !%s (str + 1, resword->%s + 1, len - 1)", option[STRCASECMP] ? "charmap[*str]" : "*str", option.key_name (), diff --git a/apps/gperf/src/List_Node.cpp b/apps/gperf/src/List_Node.cpp index 9564c1829f7..b5e22bc0bb9 100644 --- a/apps/gperf/src/List_Node.cpp +++ b/apps/gperf/src/List_Node.cpp @@ -28,6 +28,7 @@ ACE_RCSID(src, List_Node, "$Id$") #if defined (ACE_HAS_GPERF) #include "Vectors.h" +#include "ace/os_include/os_ctype.h" // Sorts the key set alphabetically to speed up subsequent operation // Uses insertion sort since the set is probably quite small. diff --git a/apps/gperf/src/Options.cpp b/apps/gperf/src/Options.cpp index 4b543045855..b74c1023d75 100644 --- a/apps/gperf/src/Options.cpp +++ b/apps/gperf/src/Options.cpp @@ -31,6 +31,8 @@ ACE_RCSID(src, Options, "$Id$") #include "ace/Get_Opt.h" #include "Iterator.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" // Global option coordinator for the entire program. Options option; diff --git a/apps/gperf/src/Options.h b/apps/gperf/src/Options.h index bc737b0cd6e..783c1304663 100644 --- a/apps/gperf/src/Options.h +++ b/apps/gperf/src/Options.h @@ -25,7 +25,6 @@ #define OPTIONS_H #include "ace/Log_Msg.h" -#include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/gperf/src/Vectors.h b/apps/gperf/src/Vectors.h index 236ff0986eb..6555c3f50b7 100644 --- a/apps/gperf/src/Vectors.h +++ b/apps/gperf/src/Vectors.h @@ -24,7 +24,7 @@ #ifndef VECTORS_H #define VECTORS_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/apps/gperf/src/gperf.cpp b/apps/gperf/src/gperf.cpp index ef8b9c31792..244ba24b498 100644 --- a/apps/gperf/src/gperf.cpp +++ b/apps/gperf/src/gperf.cpp @@ -33,6 +33,8 @@ ACE_RCSID(src, gperf, "$Id$") #if defined (ACE_HAS_GPERF) #include "Options.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_stdio.h" int main (int argc, char *argv[]) diff --git a/apps/gperf/tests/test.cpp b/apps/gperf/tests/test.cpp index 156b9bf922d..b73a9214e80 100644 --- a/apps/gperf/tests/test.cpp +++ b/apps/gperf/tests/test.cpp @@ -5,7 +5,8 @@ // The -v option prints diagnostics as to whether a word is in the set // or not. Without -v the program is useful for timing. -#include "ace/OS.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(tests, test, "$Id$") @@ -25,9 +26,9 @@ main (int argc, char *argv[]) int len = ACE_OS::strlen (buf) - 1; buf[len] = '\0'; if (in_word_set (buf, len) && verbose) - printf ("in word set %s\n", buf); + ACE_OS::printf ("in word set %s\n", buf); else if (verbose) - printf ("NOT in word set %s\n", buf); + ACE_OS::printf ("NOT in word set %s\n", buf); } return 0; diff --git a/apps/mkcsregdb/mkcsregdb.cpp b/apps/mkcsregdb/mkcsregdb.cpp index 097f68b0bd9..ea862ae4d42 100644 --- a/apps/mkcsregdb/mkcsregdb.cpp +++ b/apps/mkcsregdb/mkcsregdb.cpp @@ -11,6 +11,9 @@ #include "ace/streams.h" #include "ace/Codeset_Registry.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_sys_stat.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_stdio.h" class csdb_generator : public ACE_Codeset_Registry { diff --git a/apps/soreduce/Library.cpp b/apps/soreduce/Library.cpp index 9dfa945d47f..8222415cdf7 100644 --- a/apps/soreduce/Library.cpp +++ b/apps/soreduce/Library.cpp @@ -11,10 +11,10 @@ // library. -#include <ace/OS.h> -#include <ace/OS_Dirent.h> -#include <ace/Log_Msg.h> -#include <ace/streams.h> +#include "ace/OS_NS_dirent.h" +#include "ace/Log_Msg.h" +#include "ace/streams.h" +#include "ace/OS_NS_sys_stat.h" #include "Library.h" @@ -250,13 +250,13 @@ Library::has_modules () const static int selector (const dirent *d) { - return ACE_OS_String::strstr (d->d_name, ".o") != 0; + return ACE_OS::strstr (d->d_name, ".o") != 0; } static int comparator (const dirent **d1, const dirent **d2) { - return ACE_OS_String::strcmp ((*d1)->d_name, (*d2)->d_name); + return ACE_OS::strcmp ((*d1)->d_name, (*d2)->d_name); } void @@ -265,7 +265,7 @@ Library::load_modules () ACE_CString subdir = path_ + "/.shobj"; struct dirent **dent; - num_modules_ = ACE_OS_Dirent::scandir(subdir.c_str(), + num_modules_ = ACE_OS::scandir(subdir.c_str(), &dent,selector,comparator); if (num_modules_ > 0) { @@ -273,12 +273,12 @@ Library::load_modules () for (int i = 0; i < num_modules_; i++) { modules_[i] = new Obj_Module(dent[i]->d_name); modules_[i]->add_source (ACE_CString(subdir + "/" + dent[i]->d_name).c_str()); - ACE_OS_Memory::free(dent[i]); + ACE_OS::free(dent[i]); }; } if (num_modules_ > -1) - ACE_OS_Memory::free(dent); + ACE_OS::free(dent); } void diff --git a/apps/soreduce/Obj_Module.cpp b/apps/soreduce/Obj_Module.cpp index 7fa3fcfe934..4da90b63b6e 100644 --- a/apps/soreduce/Obj_Module.cpp +++ b/apps/soreduce/Obj_Module.cpp @@ -150,7 +150,7 @@ Obj_Module::add_source(const ACE_TCHAR *p, int imports_only) if (eoln == 2) break; is_import = dummy == 'U'; - is_export = !imports_only && (ACE_OS_String::strchr("BCDRTVW",dummy) != 0); + is_export = !imports_only && (ACE_OS::strchr("BCDRTVW",dummy) != 0); // if (ACE::recv(pipe[0],&dummy,1,&timeout) != 1) if (ACE_OS::read(pipe[0],&dummy,1) != 1) diff --git a/apps/soreduce/SO_Group.cpp b/apps/soreduce/SO_Group.cpp index d2af08ef61b..1e4a20a7a62 100644 --- a/apps/soreduce/SO_Group.cpp +++ b/apps/soreduce/SO_Group.cpp @@ -1,9 +1,8 @@ -#include <ace/OS.h> -#include <ace/Log_Msg.h> +#include "ace/Log_Msg.h" -#include <ace/Process.h> -#include <ace/Pipe.h> +#include "ace/Process.h" +#include "ace/Pipe.h" #include "Library.h" #include "SO_Group.h" diff --git a/examples/ASX/Event_Server/Event_Server/Options.cpp b/examples/ASX/Event_Server/Event_Server/Options.cpp index 1bf6f760c47..a10270a5369 100644 --- a/examples/ASX/Event_Server/Event_Server/Options.cpp +++ b/examples/ASX/Event_Server/Event_Server/Options.cpp @@ -4,6 +4,7 @@ #include "ace/Synch.h" #include "ace/Thread.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" #include "Options.h" diff --git a/examples/ASX/Event_Server/Event_Server/Options.h b/examples/ASX/Event_Server/Event_Server/Options.h index fbde9aa1c34..0dbe093a079 100644 --- a/examples/ASX/Event_Server/Event_Server/Options.h +++ b/examples/ASX/Event_Server/Event_Server/Options.h @@ -4,7 +4,7 @@ #ifndef OPTIONS_H #define OPTIONS_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/examples/ASX/Message_Queue/bounded_buffer.cpp b/examples/ASX/Message_Queue/bounded_buffer.cpp index a631d2d4861..ada4c6304d1 100644 --- a/examples/ASX/Message_Queue/bounded_buffer.cpp +++ b/examples/ASX/Message_Queue/bounded_buffer.cpp @@ -6,6 +6,8 @@ #include "ace/Message_Queue.h" #include "ace/Thread_Manager.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(Message_Queue, bounded_buffer, "$Id$") diff --git a/examples/ASX/Message_Queue/buffer_stream.cpp b/examples/ASX/Message_Queue/buffer_stream.cpp index 80681b44fb8..33dd26f5a34 100644 --- a/examples/ASX/Message_Queue/buffer_stream.cpp +++ b/examples/ASX/Message_Queue/buffer_stream.cpp @@ -13,6 +13,7 @@ #include "ace/Stream.h" #include "ace/Module.h" #include "ace/Task.h" +#include "ace/OS_NS_time.h" ACE_RCSID(Message_Queue, buffer_stream, "$Id$") diff --git a/examples/ASX/UPIPE_Event_Server/Options.cpp b/examples/ASX/UPIPE_Event_Server/Options.cpp index d5055415ded..d5a01cb9f0e 100644 --- a/examples/ASX/UPIPE_Event_Server/Options.cpp +++ b/examples/ASX/UPIPE_Event_Server/Options.cpp @@ -3,6 +3,8 @@ #include "ace/Get_Opt.h" #include "ace/Synch.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_Thread.h" +#include "ace/OS_NS_stdio.h" #include "Options.h" diff --git a/examples/ASX/UPIPE_Event_Server/Options.h b/examples/ASX/UPIPE_Event_Server/Options.h index 3badf1e9daf..2a98787398b 100644 --- a/examples/ASX/UPIPE_Event_Server/Options.h +++ b/examples/ASX/UPIPE_Event_Server/Options.h @@ -6,7 +6,7 @@ #ifndef DEVICE_OPTIONS_H #define DEVICE_OPTIONS_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/examples/C++NPv1/Logging_Client.cpp b/examples/C++NPv1/Logging_Client.cpp index d3308ea649e..2a542ba9f4a 100644 --- a/examples/C++NPv1/Logging_Client.cpp +++ b/examples/C++NPv1/Logging_Client.cpp @@ -4,7 +4,7 @@ ** Copyright 2001 Addison Wesley. All Rights Reserved. */ -#include "ace/OS.h" +#include "ace/OS_NS_sys_time.h" #include "ace/CDR_Stream.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Connector.h" diff --git a/examples/C++NPv1/Logging_Server.cpp b/examples/C++NPv1/Logging_Server.cpp index ec4317a6d97..c33c5efd2d5 100644 --- a/examples/C++NPv1/Logging_Server.cpp +++ b/examples/C++NPv1/Logging_Server.cpp @@ -10,6 +10,7 @@ #include "ace/INET_Addr.h" #include "ace/SOCK_Stream.h" #include "Logging_Server.h" +#include "ace/OS_NS_string.h" int Logging_Server::run (int argc, char *argv[]) { @@ -56,10 +57,10 @@ int Logging_Server::make_log_file (ACE_FILE_IO &logging_file, ACE_INET_Addr logging_peer_addr; logging_peer->get_remote_addr (logging_peer_addr); logging_peer_addr.get_host_name (filename, MAXHOSTNAMELEN); - strcat (filename, ".log"); + ACE_OS::strcat (filename, ".log"); } else - strcpy (filename, "logging_server.log"); + ACE_OS::strcpy (filename, "logging_server.log"); ACE_FILE_Connector connector; return connector.connect (logging_file, diff --git a/examples/C++NPv1/Reactive_Logging_Server_Ex.h b/examples/C++NPv1/Reactive_Logging_Server_Ex.h index 371190f8f75..ad9724df3a4 100644 --- a/examples/C++NPv1/Reactive_Logging_Server_Ex.h +++ b/examples/C++NPv1/Reactive_Logging_Server_Ex.h @@ -15,9 +15,9 @@ #include "ace/Log_Record.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Stream.h" -#include "ace/Synch.h" #include "Logging_Server.h" #include "Logging_Handler.h" +#include "ace/Null_Mutex.h" typedef ACE_Hash_Map_Manager<ACE_HANDLE, ACE_FILE_IO *, diff --git a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp index 601fa6e0ec7..00078e85673 100644 --- a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp +++ b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp @@ -4,7 +4,6 @@ ** Copyright 2002 Addison Wesley. All Rights Reserved. */ -#include "ace/OS.h" #include "ace/Acceptor.h" #include "ace/Connector.h" #include "ace/Get_Opt.h" @@ -399,7 +398,7 @@ int AC_Client_Logging_Daemon::init u_short cld_port = ACE_DEFAULT_SERVICE_PORT; u_short sld_port = ACE_DEFAULT_LOGGING_SERVER_PORT; ACE_TCHAR sld_host[MAXHOSTNAMELEN]; - ACE_OS_String::strcpy (sld_host, ACE_LOCALHOST); + ACE_OS::strcpy (sld_host, ACE_LOCALHOST); ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0); get_opt.long_option (ACE_TEXT ("client_port"), 'p', @@ -420,7 +419,7 @@ int AC_Client_Logging_Daemon::init (u_short, ACE_OS::atoi (get_opt.opt_arg ())); break; case 's': // Server logging daemon hostname. - ACE_OS_String::strsncpy + ACE_OS::strsncpy (sld_host, get_opt.opt_arg (), MAXHOSTNAMELEN); break; } diff --git a/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp index 923ea7bfe67..3d12842739d 100644 --- a/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp +++ b/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp @@ -4,7 +4,6 @@ ** Copyright 2002 Addison Wesley. All Rights Reserved. */ -#include "ace/OS.h" #include "ace/Asynch_Acceptor.h" #include "ace/Asynch_Connector.h" #include "ace/Asynch_IO.h" @@ -386,7 +385,7 @@ int AIO_Client_Logging_Daemon::init u_short cld_port = ACE_DEFAULT_SERVICE_PORT; u_short sld_port = ACE_DEFAULT_LOGGING_SERVER_PORT; ACE_TCHAR sld_host[MAXHOSTNAMELEN]; - ACE_OS_String::strcpy (sld_host, ACE_LOCALHOST); + ACE_OS::strcpy (sld_host, ACE_LOCALHOST); ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0); get_opt.long_option (ACE_TEXT ("client_port"), 'p', @@ -407,7 +406,7 @@ int AIO_Client_Logging_Daemon::init (u_short, ACE_OS::atoi (get_opt.opt_arg ())); break; case 's': // Server logging daemon hostname. - ACE_OS_String::strsncpy + ACE_OS::strsncpy (sld_host, get_opt.opt_arg (), MAXHOSTNAMELEN); break; } diff --git a/examples/C++NPv2/Client_Logging_Daemon.cpp b/examples/C++NPv2/Client_Logging_Daemon.cpp index 696c0b1bc6c..777e56f757a 100644 --- a/examples/C++NPv2/Client_Logging_Daemon.cpp +++ b/examples/C++NPv2/Client_Logging_Daemon.cpp @@ -4,7 +4,6 @@ ** Copyright 2002 Addison Wesley. All Rights Reserved. */ -#include "ace/OS.h" #include "ace/Event_Handler.h" #include "ace/INET_Addr.h" #include "ace/Get_Opt.h" @@ -14,7 +13,6 @@ #include "ace/Reactor.h" #include "ace/Service_Object.h" #include "ace/Signal.h" -#include "ace/Synch.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_Stream.h" @@ -332,7 +330,7 @@ int Client_Logging_Daemon::init (int argc, ACE_TCHAR *argv[]) { u_short cld_port = ACE_DEFAULT_SERVICE_PORT; u_short sld_port = ACE_DEFAULT_LOGGING_SERVER_PORT; ACE_TCHAR sld_host[MAXHOSTNAMELEN]; - ACE_OS_String::strcpy (sld_host, ACE_LOCALHOST); + ACE_OS::strcpy (sld_host, ACE_LOCALHOST); ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0); get_opt.long_option (ACE_TEXT ("client_port"), 'p', @@ -353,7 +351,7 @@ int Client_Logging_Daemon::init (int argc, ACE_TCHAR *argv[]) { (u_short, ACE_OS::atoi (get_opt.opt_arg ())); break; case 's': // Server logging daemon hostname. - ACE_OS_String::strsncpy + ACE_OS::strsncpy (sld_host, get_opt.opt_arg (), MAXHOSTNAMELEN); break; } diff --git a/examples/C++NPv2/Configurable_Logging_Server.cpp b/examples/C++NPv2/Configurable_Logging_Server.cpp index 7ba77999b42..bcd6d42b884 100644 --- a/examples/C++NPv2/Configurable_Logging_Server.cpp +++ b/examples/C++NPv2/Configurable_Logging_Server.cpp @@ -4,7 +4,7 @@ ** Copyright 2002 Addison Wesley. All Rights Reserved. */ -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/Service_Config.h" #include "ace/Reactor.h" diff --git a/examples/C++NPv2/Logging_Event_Handler.cpp b/examples/C++NPv2/Logging_Event_Handler.cpp index e6de908074d..26da7053c7c 100644 --- a/examples/C++NPv2/Logging_Event_Handler.cpp +++ b/examples/C++NPv2/Logging_Event_Handler.cpp @@ -7,6 +7,7 @@ #include "ace/FILE_Connector.h" #include "Logging_Event_Handler.h" +#include "ace/OS_NS_string.h" int Logging_Event_Handler::open () { @@ -16,7 +17,7 @@ int Logging_Event_Handler::open () { logging_handler_.peer ().get_remote_addr (logging_peer_addr); logging_peer_addr.get_host_name (filename, MAXHOSTNAMELEN); - strcat (filename, LOGFILE_SUFFIX); + ACE_OS::strcat (filename, LOGFILE_SUFFIX); ACE_FILE_Connector connector; connector.connect (log_file_, diff --git a/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp b/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp index 1a5c8c11cae..128ad5cabd3 100644 --- a/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp +++ b/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp @@ -11,6 +11,8 @@ #include "ace/Auto_Ptr.h" #include "ace/INET_Addr.h" #include "Reactor_Logging_Server_Adapter.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" template <class ACCEPTOR> int Reactor_Logging_Server_Adapter<ACCEPTOR>::init (int argc, @@ -45,13 +47,13 @@ Reactor_Logging_Server_Adapter<ACCEPTOR>::info ACE_OS::sprintf (buf, ACE_TEXT ("%hu"), local_addr.get_port_number ()); - ACE_OS_String::strcat + ACE_OS::strcat (buf, ACE_TEXT ("/tcp # Reactor-based logging server\n")); if (*bufferp == 0) *bufferp = ACE::strnew (buf); else - ACE_OS_String::strncpy (*bufferp, buf, length); - return ACE_OS_String::strlen (*bufferp); + ACE_OS::strncpy (*bufferp, buf, length); + return ACE_OS::strlen (*bufferp); } diff --git a/examples/C++NPv2/SR_Configurable_Logging_Server.cpp b/examples/C++NPv2/SR_Configurable_Logging_Server.cpp index 4e8eb05e5e5..764af2c9839 100644 --- a/examples/C++NPv2/SR_Configurable_Logging_Server.cpp +++ b/examples/C++NPv2/SR_Configurable_Logging_Server.cpp @@ -4,7 +4,7 @@ ** Copyright 2002 Addison Wesley. All Rights Reserved. */ -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/Reactor.h" #include "ace/Select_Reactor.h" #include "ace/Service_Config.h" diff --git a/examples/C++NPv2/Select_Reactor_Logging_Server.cpp b/examples/C++NPv2/Select_Reactor_Logging_Server.cpp index a7c80a3c4eb..b42e8ef359c 100644 --- a/examples/C++NPv2/Select_Reactor_Logging_Server.cpp +++ b/examples/C++NPv2/Select_Reactor_Logging_Server.cpp @@ -63,7 +63,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) { for (;;) { char user_input[80]; gets (user_input); - if (ACE_OS_String::strcmp (user_input, "quit") == 0) { + if (ACE_OS::strcmp (user_input, "quit") == 0) { reactor->notify (quit_handler); break; } diff --git a/examples/C++NPv2/Server_Shutdown.cpp b/examples/C++NPv2/Server_Shutdown.cpp index 7aa53224ec0..51cbe716203 100644 --- a/examples/C++NPv2/Server_Shutdown.cpp +++ b/examples/C++NPv2/Server_Shutdown.cpp @@ -4,7 +4,6 @@ ** Copyright 2002 Addison Wesley. All Rights Reserved. */ -#include "ace/OS.h" #include "ace/Event_Handler.h" #include "ace/Reactor.h" #include "ace/Service_Object.h" @@ -52,7 +51,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) { for (;;) { char user_input[80]; gets (user_input); - if (ACE_OS_String::strcmp (user_input, "quit") == 0) { + if (ACE_OS::strcmp (user_input, "quit") == 0) { reactor->notify (quit_handler); break; } diff --git a/examples/C++NPv2/Service_Reporter.cpp b/examples/C++NPv2/Service_Reporter.cpp index ba241ec67ea..9080e4e6f5e 100644 --- a/examples/C++NPv2/Service_Reporter.cpp +++ b/examples/C++NPv2/Service_Reporter.cpp @@ -4,7 +4,7 @@ ** Copyright 2002 Addison Wesley. All Rights Reserved. */ -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" #include "ace/INET_Addr.h" #include "ace/Log_Msg.h" @@ -51,12 +51,12 @@ int Service_Reporter::handle_input (ACE_HANDLE) { iovec iov[3]; iov[0].iov_base = ACE_const_cast (char *, st->name ()); iov[0].iov_len = - ACE_OS_String::strlen (st->name ()) * sizeof (ACE_TCHAR); + ACE_OS::strlen (st->name ()) * sizeof (ACE_TCHAR); const ACE_TCHAR *state = st->active () ? ACE_TEXT (" (active) ") : ACE_TEXT (" (paused) "); iov[1].iov_base = ACE_const_cast (char *, state); iov[1].iov_len = - ACE_OS_String::strlen (state) * sizeof (ACE_TCHAR); + ACE_OS::strlen (state) * sizeof (ACE_TCHAR); ACE_TCHAR *report = 0; // Ask info() to allocate buffer int len = st->type ()->info (&report, 0); iov[2].iov_base = ACE_static_cast (char *, report); @@ -79,13 +79,13 @@ int Service_Reporter::info (ACE_TCHAR **bufferp, ACE_TCHAR buf[BUFSIZ]; ACE_OS::sprintf (buf, ACE_TEXT ("%hu"), local_addr.get_port_number ()); - ACE_OS_String::strcat + ACE_OS::strcat (buf, ACE_TEXT ("/tcp # lists services in daemon\n")); if (*bufferp == 0) *bufferp = ACE::strnew (buf); else - ACE_OS_String::strncpy (*bufferp, buf, length); - return ACE_OS_String::strlen (*bufferp); + ACE_OS::strncpy (*bufferp, buf, length); + return ACE_OS::strlen (*bufferp); } diff --git a/examples/C++NPv2/TPC_Logging_Server.cpp b/examples/C++NPv2/TPC_Logging_Server.cpp index 7c78c02d22a..c01a4c54459 100644 --- a/examples/C++NPv2/TPC_Logging_Server.cpp +++ b/examples/C++NPv2/TPC_Logging_Server.cpp @@ -6,7 +6,6 @@ ** Copyright 2002 Addison Wesley. All Rights Reserved. */ -#include "ace/OS.h" #include "ace/FILE_Addr.h" #include "ace/FILE_Connector.h" #include "Reactor_Logging_Server_Adapter.h" @@ -20,7 +19,7 @@ int TPC_Logging_Handler::open (void *) { peer ().get_remote_addr (logging_peer_addr); logging_peer_addr.get_host_name (filename, MAXHOSTNAMELEN); - ACE_OS_String::strcat (filename, LOGFILE_SUFFIX); + ACE_OS::strcat (filename, LOGFILE_SUFFIX); ACE_FILE_Connector connector; connector.connect (log_file_, diff --git a/examples/C++NPv2/TP_Logging_Server.cpp b/examples/C++NPv2/TP_Logging_Server.cpp index 251179032a9..3f0cb9bb51c 100644 --- a/examples/C++NPv2/TP_Logging_Server.cpp +++ b/examples/C++NPv2/TP_Logging_Server.cpp @@ -4,7 +4,6 @@ ** Copyright 2002 Addison Wesley. All Rights Reserved. */ -#include "ace/OS.h" #include "ace/Message_Block.h" #include "TP_Logging_Server.h" diff --git a/examples/C++NPv2/TP_Logging_Server.h b/examples/C++NPv2/TP_Logging_Server.h index 1ea62c796ed..be7d35316e1 100644 --- a/examples/C++NPv2/TP_Logging_Server.h +++ b/examples/C++NPv2/TP_Logging_Server.h @@ -7,7 +7,6 @@ #ifndef _TP_LOGGING_SERVER_H #define _TP_LOGGING_SERVER_H -#include "ace/OS.h" #include "ace/Auto_Ptr.h" #include "ace/Singleton.h" #include "ace/Synch.h" diff --git a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp index d1ac0536c78..a85196d16ce 100644 --- a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp +++ b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp @@ -64,7 +64,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) { for (;;) { char user_input[80]; gets (user_input); - if (ACE_OS_String::strcmp (user_input, "quit") == 0) { + if (ACE_OS::strcmp (user_input, "quit") == 0) { reactor->notify (quit_handler); break; } diff --git a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp index 5cdc6814f2b..b68e4f742bb 100644 --- a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp +++ b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp @@ -48,7 +48,7 @@ public: return -1; user_input[count] = '\0'; - if (ACE_OS_String::strncmp (user_input, "quit", 4) == 0) + if (ACE_OS::strncmp (user_input, "quit", 4) == 0) return -1; return 0; } diff --git a/examples/C++NPv2/display_logfile.cpp b/examples/C++NPv2/display_logfile.cpp index 16ace4a5cb5..612e364ecc6 100644 --- a/examples/C++NPv2/display_logfile.cpp +++ b/examples/C++NPv2/display_logfile.cpp @@ -4,7 +4,6 @@ ** Copyright 2002 Addison Wesley. All Rights Reserved. */ -#include "ace/OS.h" #include "ace/CDR_Stream.h" #include "ace/FILE_Addr.h" #include "ace/FILE_Connector.h" @@ -13,9 +12,10 @@ #include "ace/Module.h" #include "ace/SString.h" #include "ace/Stream.h" -#include "ace/Synch.h" #include "ace/Task.h" #include "ace/Thread_Manager.h" +#include "ace/Lock_Adapter_T.h" +#include "ace/OS_NS_time.h" template <class TASK> class Logrec_Module : public ACE_Module<ACE_SYNCH> @@ -79,7 +79,7 @@ public: // extract what's needed, crunch the block to move all remaining // data to the beginning and read more from the file. for (;;) { - size_t name_len = ACE_OS_String::strnlen + size_t name_len = ACE_OS::strnlen (mblk.rd_ptr (), mblk.length ()); if (name_len == mblk.length ()) break; diff --git a/examples/DLL/Newsweek.cpp b/examples/DLL/Newsweek.cpp index 33e6d9868a6..4d90c5e333c 100644 --- a/examples/DLL/Newsweek.cpp +++ b/examples/DLL/Newsweek.cpp @@ -5,6 +5,7 @@ #include "Newsweek.h" #include "ace/Log_Msg.h" #include "ace/svc_export.h" +#include "ace/OS_Memory.h" // Implementation of the abstract class method which describes // the magazine. diff --git a/examples/DLL/Newsweek.h b/examples/DLL/Newsweek.h index 2e6d634cafa..82f7c74f49f 100644 --- a/examples/DLL/Newsweek.h +++ b/examples/DLL/Newsweek.h @@ -21,8 +21,8 @@ #ifndef NEWSWEEK_H #define NEWSWEEK_H -#include "ace/OS.h" #include "Magazine.h" +#include "ace/os_include/os_stddef.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/examples/DLL/Today.cpp b/examples/DLL/Today.cpp index 1cc087f38f4..359826c94a9 100644 --- a/examples/DLL/Today.cpp +++ b/examples/DLL/Today.cpp @@ -5,6 +5,7 @@ #include "Today.h" #include "ace/Log_Msg.h" #include "ace/svc_export.h" +#include "ace/OS_Memory.h" // Implementation of the abstract class method which describes the // magazine. diff --git a/examples/DLL/Today.h b/examples/DLL/Today.h index 6b0fdaa2c28..bae5d238e94 100644 --- a/examples/DLL/Today.h +++ b/examples/DLL/Today.h @@ -21,8 +21,8 @@ #ifndef TODAY_H #define TODAY_H -#include "ace/OS.h" #include "Magazine.h" +#include "ace/os_include/os_stddef.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/examples/IPC_SAP/ATM_SAP/CPP-client.cpp b/examples/IPC_SAP/ATM_SAP/CPP-client.cpp index 2a00d136e33..cbe2c00ae5c 100644 --- a/examples/IPC_SAP/ATM_SAP/CPP-client.cpp +++ b/examples/IPC_SAP/ATM_SAP/CPP-client.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/ATM_Connector.h" #include "ace/ATM_Addr.h" #include "ace/High_Res_Timer.h" diff --git a/examples/IPC_SAP/ATM_SAP/CPP-server.cpp b/examples/IPC_SAP/ATM_SAP/CPP-server.cpp index 57489b9b652..8cf6e9c9c92 100644 --- a/examples/IPC_SAP/ATM_SAP/CPP-server.cpp +++ b/examples/IPC_SAP/ATM_SAP/CPP-server.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/ATM_Acceptor.h" #include "ace/ATM_Addr.h" #include "ace/High_Res_Timer.h" diff --git a/examples/IPC_SAP/DEV_SAP/reader/reader.cpp b/examples/IPC_SAP/DEV_SAP/reader/reader.cpp index c6f8801380f..9a22e3f756f 100644 --- a/examples/IPC_SAP/DEV_SAP/reader/reader.cpp +++ b/examples/IPC_SAP/DEV_SAP/reader/reader.cpp @@ -1,6 +1,5 @@ // $Id$ -#include "ace/OS.h" #include "ace/DEV_Addr.h" #include "ace/DEV_Connector.h" #include "ace/DEV_IO.h" diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp index 9186e5f6d1e..6f4199da1a3 100644 --- a/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp +++ b/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp @@ -1,7 +1,8 @@ // $Id$ #include "ace/FIFO_Send_Msg.h" -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_main.h" ACE_RCSID(FIFO_SAP, FIFO_Msg_client, "$Id$") diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp index da38671afdc..6b653ba24e5 100644 --- a/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp +++ b/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp @@ -2,6 +2,8 @@ #include "ace/FIFO_Recv_Msg.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_main.h" ACE_RCSID(FIFO_SAP, FIFO_Msg_server, "$Id$") diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp index dac5c740120..8c80809f380 100644 --- a/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp +++ b/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp @@ -2,6 +2,9 @@ #include "ace/FIFO_Send.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_main.h" ACE_RCSID(FIFO_SAP, FIFO_client, "$Id$") diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp index 8ef94e9e905..eb31e171725 100644 --- a/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp +++ b/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp @@ -2,6 +2,8 @@ #include "ace/FIFO_Recv.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_main.h" ACE_RCSID(FIFO_SAP, FIFO_server, "$Id$") diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp index 3a79d275215..277874db3cd 100644 --- a/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp +++ b/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp @@ -9,6 +9,7 @@ #include "ace/FIFO_Recv.h" #include "ace/FIFO_Send.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_sys_wait.h" ACE_RCSID(FIFO_SAP, FIFO_test, "$Id$") diff --git a/examples/IPC_SAP/FILE_SAP/client.cpp b/examples/IPC_SAP/FILE_SAP/client.cpp index ea04ffed654..0a04f3b2d09 100644 --- a/examples/IPC_SAP/FILE_SAP/client.cpp +++ b/examples/IPC_SAP/FILE_SAP/client.cpp @@ -1,9 +1,11 @@ // $Id$ -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/FILE_Addr.h" #include "ace/FILE_Connector.h" #include "ace/FILE_IO.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(FILE_SAP, client, "$Id$") diff --git a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp index d9c6ca3ac18..724491fdb0a 100644 --- a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp +++ b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp @@ -1,6 +1,13 @@ // $Id$ -#include "ace/OS.h" +#include "ace/OS_main.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_netdb.h" +#include "ace/Default_Constants.h" ACE_RCSID(SOCK_SAP, C_inclient, "$Id$") diff --git a/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp b/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp index 6f53ab2db9d..3273a306cdc 100644 --- a/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp +++ b/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp @@ -1,6 +1,14 @@ // $Id$ -#include "ace/OS.h" +#include "ace/OS_main.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_netdb.h" +#include "ace/OS_NS_errno.h" +#include "ace/Default_Constants.h" ACE_RCSID(SOCK_SAP, C_inserver, "$Id$") diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp index ea1835908cb..bba003e1c39 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp @@ -6,15 +6,16 @@ // is useful as a baseline to compare against ORB-level performance // for the same types of data. +#include "CPP-inclient.h" + #include "ace/SOCK_Connector.h" #include "ace/INET_Addr.h" #include "ace/Thread_Manager.h" #include "ace/Singleton.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" -#include "ace/Synch.h" - -#include "CPP-inclient.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_main.h" ACE_RCSID(SOCK_SAP, CPP_inclient, "$Id$") diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h index 266de7f32ea..de5f4aac030 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h +++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h @@ -6,9 +6,8 @@ #ifndef __CPP_INCLIENT_H #define __CPP_INCLIENT_H -#include "ace/OS.h" #include "ace/SOCK_Stream.h" -#include "ace/Synch.h" +#include "ace/Barrier.h" class Options // = TITLE diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp index 9034292f638..8be302f8ebd 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp @@ -5,12 +5,14 @@ // supports threads it uses a thread-per-connection concurrency model. // Otherwise, it uses a single-threaded iterative server model. +#include "ace/OS_main.h" #include "ace/SOCK_Acceptor.h" #include "ace/Svc_Handler.h" #include "ace/Singleton.h" #include "ace/Synch.h" #include "ace/Profile_Timer.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_sys_select.h" #include "CPP-inserver-fancy.h" diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp index a1d41fc5941..a281d2e380d 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp @@ -5,10 +5,13 @@ // single-threaded concurrent server. This server program can be // driven by the oneway test mode of CPP-inclient.cpp. +#include "ace/OS_main.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Stream.h" #include "ace/INET_Addr.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_poll.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(SOCK_SAP, CPP_inserver_poll, "$Id$") diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp index 094af0673b1..71b568fd9cc 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp @@ -9,6 +9,8 @@ #include "ace/Thread_Manager.h" #include "ace/Handle_Set.h" #include "ace/Profile_Timer.h" +#include "ace/OS_NS_sys_select.h" +#include "ace/OS_main.h" ACE_RCSID(SOCK_SAP, CPP_inserver, "$Id$") diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp index 6fd627a50bb..850570bd02f 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp @@ -5,7 +5,6 @@ #include "ace/LSOCK_Connector.h" #include "ace/UNIX_Addr.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" ACE_RCSID(SOCK_SAP, CPP_unclient, "$Id$") diff --git a/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp b/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp index 97e7adb61e3..97b988e2853 100644 --- a/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp +++ b/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp @@ -3,7 +3,7 @@ #include "ace/LSOCK_Connector.h" #include "ace/UNIX_Addr.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" +#include "ace/OS_main.h" ACE_RCSID(SOCK_SAP, FD_unclient, "$Id$") diff --git a/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp b/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp index 66121d8c505..bf86d12082e 100644 --- a/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp +++ b/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp @@ -4,7 +4,9 @@ #include "ace/LSOCK_Stream.h" #include "ace/UNIX_Addr.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" +#include "ace/OS_main.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(SOCK_SAP, FD_unserver, "$Id$") diff --git a/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp b/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp index 17ea66317e4..1c8c2c3dede 100644 --- a/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp @@ -1,8 +1,10 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/SPIPE_Addr.h" #include "ace/SPIPE_Connector.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" ACE_RCSID(SPIPE_SAP, NPClient, "$Id$") diff --git a/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp b/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp index c7ea7c12eca..762a634b015 100644 --- a/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp @@ -3,6 +3,7 @@ #include "ace/SPIPE_Addr.h" #include "ace/SPIPE_Acceptor.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(SPIPE_SAP, NPServer, "$Id$") diff --git a/examples/IPC_SAP/SPIPE_SAP/client.cpp b/examples/IPC_SAP/SPIPE_SAP/client.cpp index 989a8ac3c49..934a4a0390e 100644 --- a/examples/IPC_SAP/SPIPE_SAP/client.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/client.cpp @@ -1,8 +1,10 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/SPIPE_Addr.h" #include "ace/SPIPE_Connector.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(SPIPE_SAP, client, "$Id$") diff --git a/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp b/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp index febcfeca0e0..19c41f7cbef 100644 --- a/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp @@ -1,8 +1,10 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/SPIPE_Addr.h" #include "ace/SPIPE_Acceptor.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(SPIPE_SAP, consumer_msg, "$Id$") diff --git a/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp b/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp index 84f9e96ec05..95f088eff46 100644 --- a/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp @@ -1,8 +1,10 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/SPIPE_Addr.h" #include "ace/SPIPE_Acceptor.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(SPIPE_SAP, consumer_read, "$Id$") diff --git a/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp b/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp index 088b7356a30..e663aa7f84f 100644 --- a/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp @@ -1,8 +1,10 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/SPIPE_Addr.h" #include "ace/SPIPE_Connector.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(SPIPE_SAP, producer_msg, "$Id$") diff --git a/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp b/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp index fe7d23f9bf8..03aa5ea244a 100644 --- a/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/SPIPE_Addr.h" #include "ace/SPIPE_Connector.h" #include "ace/Log_Msg.h" diff --git a/examples/IPC_SAP/SPIPE_SAP/server.cpp b/examples/IPC_SAP/SPIPE_SAP/server.cpp index 728eb824bf8..6575418e497 100644 --- a/examples/IPC_SAP/SPIPE_SAP/server.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/server.cpp @@ -1,8 +1,10 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/SPIPE_Addr.h" #include "ace/SPIPE_Acceptor.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(SPIPE_SAP, server, "$Id$") diff --git a/examples/IPC_SAP/SPIPE_SAP/shared.h b/examples/IPC_SAP/SPIPE_SAP/shared.h index 368ee0a7615..47f2e8db6bc 100644 --- a/examples/IPC_SAP/SPIPE_SAP/shared.h +++ b/examples/IPC_SAP/SPIPE_SAP/shared.h @@ -1,7 +1,7 @@ /* -*- C++ -*- */ // $Id$ -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h index 4fdd92c8a49..d044b7262e5 100644 --- a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h +++ b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h @@ -7,9 +7,8 @@ #ifndef ACE_SSL_CLIENT_SIMPLE_H #define ACE_SSL_CLIENT_SIMPLE_H -#include "ace/OS.h" - #include "ace/SSL/SSL_SOCK_Stream.h" +#include "ace/Time_Value.h" class Options // = TITLE diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client.h b/examples/IPC_SAP/SSL_SAP/SSL-client.h index e01729845c7..728e2e4a88e 100644 --- a/examples/IPC_SAP/SSL_SAP/SSL-client.h +++ b/examples/IPC_SAP/SSL_SAP/SSL-client.h @@ -7,8 +7,8 @@ #ifndef __ACE_SSL_CLIENT_H #define __ACE_SSL_CLIENT_H -#include "ace/OS.h" -#include "ace/Synch.h" +#include "ace/BArrier.h" +#include "Time_Value.h" #include "ace/SSL/SSL_SOCK_Stream.h" diff --git a/examples/IPC_SAP/UPIPE_SAP/ex1.cpp b/examples/IPC_SAP/UPIPE_SAP/ex1.cpp index 7de8e7e100f..ae071fa9afe 100644 --- a/examples/IPC_SAP/UPIPE_SAP/ex1.cpp +++ b/examples/IPC_SAP/UPIPE_SAP/ex1.cpp @@ -17,6 +17,7 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/Stream.h" #include "ace/UPIPE_Acceptor.h" #include "ace/UPIPE_Connector.h" diff --git a/examples/IPC_SAP/UPIPE_SAP/ex2.cpp b/examples/IPC_SAP/UPIPE_SAP/ex2.cpp index d807f53857d..e19a83460ce 100644 --- a/examples/IPC_SAP/UPIPE_SAP/ex2.cpp +++ b/examples/IPC_SAP/UPIPE_SAP/ex2.cpp @@ -17,9 +17,11 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/UPIPE_Connector.h" #include "ace/UPIPE_Acceptor.h" #include "ace/Auto_Ptr.h" +#include "ace/OS_NS_time.h" ACE_RCSID(UPIPE_SAP, ex2, "$Id$") diff --git a/examples/IPC_SAP/UPIPE_SAP/ex3.cpp b/examples/IPC_SAP/UPIPE_SAP/ex3.cpp index 0ef3577f075..57ff4f34d9e 100644 --- a/examples/IPC_SAP/UPIPE_SAP/ex3.cpp +++ b/examples/IPC_SAP/UPIPE_SAP/ex3.cpp @@ -18,9 +18,11 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/UPIPE_Connector.h" #include "ace/UPIPE_Acceptor.h" #include "ace/Auto_Ptr.h" +#include "ace/OS_NS_time.h" ACE_RCSID(UPIPE_SAP, ex3, "$Id$") diff --git a/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp b/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp index dc7c3a11622..00e707ffc20 100644 --- a/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp +++ b/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp @@ -14,7 +14,6 @@ static char THIS_FILE[] = __FILE__; #endif -#include <ace/OS.h> #include <ace/ACE.h> ///////////////////////////////////////////////////////////////////////////// diff --git a/examples/Log_Msg/test_callback.cpp b/examples/Log_Msg/test_callback.cpp index a3057a88824..59f87bb4c44 100644 --- a/examples/Log_Msg/test_callback.cpp +++ b/examples/Log_Msg/test_callback.cpp @@ -18,10 +18,11 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/Log_Msg.h" #include "ace/Log_Msg_Callback.h" #include "ace/Log_Record.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(Log_Msg, test_callback, "$Id$") diff --git a/examples/Log_Msg/test_log_msg.cpp b/examples/Log_Msg/test_log_msg.cpp index 035520105d5..018ab3b8978 100644 --- a/examples/Log_Msg/test_log_msg.cpp +++ b/examples/Log_Msg/test_log_msg.cpp @@ -17,9 +17,11 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/streams.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_stdlib.h" ACE_RCSID(Log_Msg, test_log_msg, "$Id$") diff --git a/examples/Log_Msg/test_ostream.cpp b/examples/Log_Msg/test_ostream.cpp index 6bc0bee4fa8..33b5cbfd498 100644 --- a/examples/Log_Msg/test_ostream.cpp +++ b/examples/Log_Msg/test_ostream.cpp @@ -17,7 +17,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/streams.h" #include "ace/Log_Msg.h" diff --git a/examples/Logger/client/logging_app.cpp b/examples/Logger/client/logging_app.cpp index e804ce04752..29f0174597d 100644 --- a/examples/Logger/client/logging_app.cpp +++ b/examples/Logger/client/logging_app.cpp @@ -6,6 +6,8 @@ #include "ace/SOCK_Connector.h" #include "ace/Log_Record.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(client, logging_app, "$Id$") diff --git a/examples/Map_Manager/test_hash_map_manager.cpp b/examples/Map_Manager/test_hash_map_manager.cpp index dec80fc5488..b9e7cddc626 100644 --- a/examples/Map_Manager/test_hash_map_manager.cpp +++ b/examples/Map_Manager/test_hash_map_manager.cpp @@ -1,9 +1,11 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/Hash_Map_Manager.h" #include "ace/ACE.h" #include "ace/SString.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(Map_Manager, test_hash_map_manager, "$Id$") diff --git a/examples/Mem_Map/IO-tests/IO_Test.cpp b/examples/Mem_Map/IO-tests/IO_Test.cpp index 72ab4bf53e5..0aebceb2de9 100644 --- a/examples/Mem_Map/IO-tests/IO_Test.cpp +++ b/examples/Mem_Map/IO-tests/IO_Test.cpp @@ -2,7 +2,9 @@ #if !defined(_WIN32) -#include "ace/OS.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_stdio.h" #include "ace/Mem_Map.h" #include "ace/Log_Msg.h" #include "IO_Test.h" diff --git a/examples/Mem_Map/IO-tests/test_io.cpp b/examples/Mem_Map/IO-tests/test_io.cpp index 30e492e7283..362bdd16582 100644 --- a/examples/Mem_Map/IO-tests/test_io.cpp +++ b/examples/Mem_Map/IO-tests/test_io.cpp @@ -3,7 +3,7 @@ // Test program for different methods of copying files. #if !defined(_WIN32) -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" #include "ace/ACE.h" #include "ace/Profile_Timer.h" #include "ace/Get_Opt.h" diff --git a/examples/Mem_Map/file-reverse/file-reverse.cpp b/examples/Mem_Map/file-reverse/file-reverse.cpp index 93893c412d7..2e64c272c12 100644 --- a/examples/Mem_Map/file-reverse/file-reverse.cpp +++ b/examples/Mem_Map/file-reverse/file-reverse.cpp @@ -3,6 +3,7 @@ // Print a file in reverse by using the ACE memory mapped file // wrapper. It is SO easy to do compared with alternatives! +#include "ace/OS_main.h" #include "ace/Mem_Map.h" #include "ace/Log_Msg.h" diff --git a/examples/Misc/test_XtReactor1.cpp b/examples/Misc/test_XtReactor1.cpp index 6dc02e9ea45..297aff30785 100644 --- a/examples/Misc/test_XtReactor1.cpp +++ b/examples/Misc/test_XtReactor1.cpp @@ -3,6 +3,7 @@ // The following is another test that exercises the Eric C. Newton's // <ecn@clark.net> XtReactor implementation. +#include "ace/OS_main.h" #include "ace/XtReactor.h" #include "ace/Reactor.h" #include "ace/Message_Block.h" diff --git a/examples/Misc/test_XtReactor2.cpp b/examples/Misc/test_XtReactor2.cpp index 973a4432e5b..f338f4e8189 100644 --- a/examples/Misc/test_XtReactor2.cpp +++ b/examples/Misc/test_XtReactor2.cpp @@ -3,6 +3,7 @@ // The following test exercises the Eric C. Newton's <ecn@clark.net> // XtReactor implementation. +#include "ace/OS_main.h" #include "ace/XtReactor.h" #include "ace/Reactor.h" #include "ace/Message_Block.h" diff --git a/examples/Misc/test_dump.cpp b/examples/Misc/test_dump.cpp index 3c18ad6c105..1d908ba7505 100644 --- a/examples/Misc/test_dump.cpp +++ b/examples/Misc/test_dump.cpp @@ -4,6 +4,7 @@ // integrated into ACE components like the SOCK_Acceptor and // SOCK_Stream. +#include "ace/OS_main.h" #include "ace/Dump.h" #include "test_dump.h" diff --git a/examples/Misc/test_dump.h b/examples/Misc/test_dump.h index b6f9d35affa..9c7e0bb7de8 100644 --- a/examples/Misc/test_dump.h +++ b/examples/Misc/test_dump.h @@ -6,7 +6,7 @@ #define __TEST_DUMP_H #include "ace/Dump.h" -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" class SOCK { diff --git a/examples/Misc/test_get_opt.cpp b/examples/Misc/test_get_opt.cpp index 9fd3e66d929..3fd0a16ac80 100644 --- a/examples/Misc/test_get_opt.cpp +++ b/examples/Misc/test_get_opt.cpp @@ -2,7 +2,7 @@ // Test the ACE_Get_Opt class. -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" diff --git a/examples/Misc/test_profile_timer.cpp b/examples/Misc/test_profile_timer.cpp index 33ee7726ffc..adb6f599f83 100644 --- a/examples/Misc/test_profile_timer.cpp +++ b/examples/Misc/test_profile_timer.cpp @@ -1,7 +1,10 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/Profile_Timer.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(Misc, test_profile_timer, "$Id$") diff --git a/examples/Misc/test_read_buffer.cpp b/examples/Misc/test_read_buffer.cpp index 0ec073a88a6..f03e2f597ee 100644 --- a/examples/Misc/test_read_buffer.cpp +++ b/examples/Misc/test_read_buffer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/Malloc_Base.h" #include "ace/Service_Config.h" #include "ace/Read_Buffer.h" diff --git a/examples/Misc/test_set.cpp b/examples/Misc/test_set.cpp index 5ed71dbeaf0..b5c81d64bc8 100644 --- a/examples/Misc/test_set.cpp +++ b/examples/Misc/test_set.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/Containers.h" #include "ace/Log_Msg.h" diff --git a/examples/Misc/test_sstring.cpp b/examples/Misc/test_sstring.cpp index ef85290c1f7..67bd996e73c 100644 --- a/examples/Misc/test_sstring.cpp +++ b/examples/Misc/test_sstring.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/SString.h" #include "ace/Log_Msg.h" diff --git a/examples/Misc/test_trace.cpp b/examples/Misc/test_trace.cpp index 23aaf25251a..2def9cf613d 100644 --- a/examples/Misc/test_trace.cpp +++ b/examples/Misc/test_trace.cpp @@ -21,7 +21,7 @@ // Enable tracing #define ACE_NTRACE 0 -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/Signal.h" #include "ace/Task.h" diff --git a/examples/NT_Service/ntsvc.cpp b/examples/NT_Service/ntsvc.cpp index d872769bc46..b20510bc84a 100644 --- a/examples/NT_Service/ntsvc.cpp +++ b/examples/NT_Service/ntsvc.cpp @@ -18,7 +18,6 @@ // // ============================================================================ -#include "ace/OS.h" #include "ace/Reactor.h" #include "ntsvc.h" diff --git a/examples/Naming/test_multiple_contexts.cpp b/examples/Naming/test_multiple_contexts.cpp index b9a7b5969f8..06cb4d1c376 100644 --- a/examples/Naming/test_multiple_contexts.cpp +++ b/examples/Naming/test_multiple_contexts.cpp @@ -1,7 +1,9 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/Naming_Context.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(Naming, test_multiple_contexts, "$Id$") diff --git a/examples/Naming/test_non_existent.cpp b/examples/Naming/test_non_existent.cpp index 8225555138f..448594bd969 100644 --- a/examples/Naming/test_non_existent.cpp +++ b/examples/Naming/test_non_existent.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/Naming_Context.h" #include "ace/Log_Msg.h" diff --git a/examples/Naming/test_open.cpp b/examples/Naming/test_open.cpp index 64166acc09d..97f8ca37373 100644 --- a/examples/Naming/test_open.cpp +++ b/examples/Naming/test_open.cpp @@ -1,7 +1,9 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/Naming_Context.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(Naming, test_open, "$Id$") diff --git a/examples/Naming/test_writers.cpp b/examples/Naming/test_writers.cpp index 85249691abd..114d9ee836e 100644 --- a/examples/Naming/test_writers.cpp +++ b/examples/Naming/test_writers.cpp @@ -1,7 +1,9 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/Naming_Context.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(Naming, test_writers, "$Id$") diff --git a/examples/OS/Process/imore.cpp b/examples/OS/Process/imore.cpp index e6470e8e777..7454bc198b3 100644 --- a/examples/OS/Process/imore.cpp +++ b/examples/OS/Process/imore.cpp @@ -22,7 +22,8 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_errno.h" #include "ace/FIFO_Recv.h" #include "ace/FIFO_Send.h" #include "ace/Pipe.h" diff --git a/examples/OS/Process/process.cpp b/examples/OS/Process/process.cpp index e68c4456604..577bd1af62a 100644 --- a/examples/OS/Process/process.cpp +++ b/examples/OS/Process/process.cpp @@ -17,7 +17,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_NS_errno.h" #include "ace/Get_Opt.h" #include "ace/Process.h" #include "ace/Log_Msg.h" diff --git a/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h b/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h index 710b8bd7c94..cdc06cea422 100644 --- a/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h +++ b/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h @@ -19,9 +19,9 @@ #include "ace/SString.h" #include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Null_Mutex.h" #include "ace/ACE.h" -#include "ace/OS.h" #include "ace/OS_QoS.h" class Fill_ACE_QoS diff --git a/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp index 9a72bf56df1..4005b40a25a 100644 --- a/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp +++ b/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp @@ -6,6 +6,7 @@ #include "ace/Log_Msg.h" #include "ace/Get_Opt.h" #include "QoS_Util.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(QOS, QoS_Util,"$Id$") diff --git a/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp b/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp index 5be73e3853b..561746a3641 100644 --- a/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp +++ b/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp @@ -17,7 +17,6 @@ #include "Sender_QoS_Event_Handler.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" #include "Fill_ACE_QoS.h" // Constructor. @@ -122,7 +121,7 @@ Sender_QoS_Event_Handler::handle_qos (ACE_HANDLE) char* msg = "Hello sent on a QoS enabled session !!\n"; iovec iov[1]; iov[0].iov_base = msg; - iov[0].iov_len = ACE_OS_String::strlen(msg); + iov[0].iov_len = ACE_OS::strlen(msg); size_t bytes_sent = 0; diff --git a/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp b/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp index 38252c4c221..abeda6cd58e 100644 --- a/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp +++ b/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp @@ -16,7 +16,6 @@ #define QOSEVENT_MAIN -#include "ace/OS.h" #include "ace/QoS/QoS_Session.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Decorator.h" diff --git a/examples/QOS/Change_Receiver_FlowSpec/sender.cpp b/examples/QOS/Change_Receiver_FlowSpec/sender.cpp index 775f01e5cd0..2dea073a12b 100644 --- a/examples/QOS/Change_Receiver_FlowSpec/sender.cpp +++ b/examples/QOS/Change_Receiver_FlowSpec/sender.cpp @@ -15,7 +15,6 @@ // ============================================================================ -#include "ace/OS.h" #include "ace/QoS/QoS_Session.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Session_Impl.h" diff --git a/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h b/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h index 710b8bd7c94..776d713e5e5 100644 --- a/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h +++ b/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h @@ -19,9 +19,8 @@ #include "ace/SString.h" #include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" +#include "ace/Null_Mutex.h" #include "ace/ACE.h" -#include "ace/OS.h" #include "ace/OS_QoS.h" class Fill_ACE_QoS diff --git a/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp index 9a72bf56df1..4005b40a25a 100644 --- a/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp +++ b/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp @@ -6,6 +6,7 @@ #include "ace/Log_Msg.h" #include "ace/Get_Opt.h" #include "QoS_Util.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(QOS, QoS_Util,"$Id$") diff --git a/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp b/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp index d57a1b69812..7688bc34373 100644 --- a/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp +++ b/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp @@ -17,7 +17,6 @@ #include "Sender_QoS_Event_Handler.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" #include "Fill_ACE_QoS.h" // Constructor. @@ -122,7 +121,7 @@ Sender_QoS_Event_Handler::handle_qos (ACE_HANDLE) char* msg = "Hello sent on a QoS enabled session !!\n"; iovec iov[1]; iov[0].iov_base = msg; - iov[0].iov_len = ACE_OS_String::strlen(msg); + iov[0].iov_len = ACE_OS::strlen(msg); size_t bytes_sent = 0; diff --git a/examples/QOS/Change_Sender_TSpec/receiver.cpp b/examples/QOS/Change_Sender_TSpec/receiver.cpp index 7faf927b262..c01433655a2 100644 --- a/examples/QOS/Change_Sender_TSpec/receiver.cpp +++ b/examples/QOS/Change_Sender_TSpec/receiver.cpp @@ -16,7 +16,6 @@ #define QOSEVENT_MAIN -#include "ace/OS.h" #include "ace/QoS/QoS_Session.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Decorator.h" diff --git a/examples/QOS/Change_Sender_TSpec/sender.cpp b/examples/QOS/Change_Sender_TSpec/sender.cpp index 9468ca4647d..7777973116d 100644 --- a/examples/QOS/Change_Sender_TSpec/sender.cpp +++ b/examples/QOS/Change_Sender_TSpec/sender.cpp @@ -15,7 +15,6 @@ // ============================================================================ -#include "ace/OS.h" #include "ace/QoS/QoS_Session.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Session_Impl.h" diff --git a/examples/QOS/Simple/Fill_ACE_QoS.h b/examples/QOS/Simple/Fill_ACE_QoS.h index 710b8bd7c94..5d7f97b91c0 100644 --- a/examples/QOS/Simple/Fill_ACE_QoS.h +++ b/examples/QOS/Simple/Fill_ACE_QoS.h @@ -21,7 +21,7 @@ #include "ace/Hash_Map_Manager.h" #include "ace/Synch.h" #include "ace/ACE.h" -#include "ace/OS.h" +#include "ace/Null_Mutex.h" #include "ace/OS_QoS.h" class Fill_ACE_QoS diff --git a/examples/QOS/Simple/QoS_Util.cpp b/examples/QOS/Simple/QoS_Util.cpp index 9a72bf56df1..4005b40a25a 100644 --- a/examples/QOS/Simple/QoS_Util.cpp +++ b/examples/QOS/Simple/QoS_Util.cpp @@ -6,6 +6,7 @@ #include "ace/Log_Msg.h" #include "ace/Get_Opt.h" #include "QoS_Util.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(QOS, QoS_Util,"$Id$") diff --git a/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp b/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp index 4d7891f191c..44334bf5229 100644 --- a/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp +++ b/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp @@ -119,7 +119,7 @@ Sender_QoS_Event_Handler::handle_qos (ACE_HANDLE) char* msg = "Hello sent on a QoS enabled session !!\n"; iovec iov[1]; iov[0].iov_base = msg; - iov[0].iov_len = ACE_OS_String::strlen(msg); + iov[0].iov_len = ACE_OS::strlen(msg); size_t bytes_sent = 0; diff --git a/examples/QOS/Simple/receiver.cpp b/examples/QOS/Simple/receiver.cpp index 30d0f2827d5..ecf85a51d45 100644 --- a/examples/QOS/Simple/receiver.cpp +++ b/examples/QOS/Simple/receiver.cpp @@ -16,7 +16,6 @@ #define QOSEVENT_MAIN -#include "ace/OS.h" #include "ace/QoS/QoS_Session.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Decorator.h" diff --git a/examples/QOS/Simple/sender.cpp b/examples/QOS/Simple/sender.cpp index baab9d72224..7ccce8eb351 100644 --- a/examples/QOS/Simple/sender.cpp +++ b/examples/QOS/Simple/sender.cpp @@ -15,7 +15,6 @@ // ============================================================================ -#include "ace/OS.h" #include "ace/QoS/QoS_Session.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Session_Impl.h" diff --git a/examples/RMCast/Send_File/Receiver.cpp b/examples/RMCast/Send_File/Receiver.cpp index e905373b4b3..9e305d5f3cd 100644 --- a/examples/RMCast/Send_File/Receiver.cpp +++ b/examples/RMCast/Send_File/Receiver.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/RMCast/RMCast_UDP_Reliable_Receiver.h" #include "ace/INET_Addr.h" #include "ace/FILE_IO.h" diff --git a/examples/RMCast/Send_File/Sender.cpp b/examples/RMCast/Send_File/Sender.cpp index 61c40d438ac..8699b5e017e 100644 --- a/examples/RMCast/Send_File/Sender.cpp +++ b/examples/RMCast/Send_File/Sender.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/RMCast/RMCast_UDP_Reliable_Sender.h" #include "ace/INET_Addr.h" #include "ace/FILE_IO.h" diff --git a/examples/Reactor/Dgram/CODgram.cpp b/examples/Reactor/Dgram/CODgram.cpp index dcf081892b6..60de891bf3a 100644 --- a/examples/Reactor/Dgram/CODgram.cpp +++ b/examples/Reactor/Dgram/CODgram.cpp @@ -25,6 +25,7 @@ // give the name "peer1" as the final argument to one and // only one of the programs so that the test will work properly. +#include "ace/OS_main.h" #include "ace/Reactor.h" #include "ace/SOCK_CODgram.h" #include "ace/INET_Addr.h" diff --git a/examples/Reactor/Dgram/Dgram.cpp b/examples/Reactor/Dgram/Dgram.cpp index ec0e02f4063..144e02beed6 100644 --- a/examples/Reactor/Dgram/Dgram.cpp +++ b/examples/Reactor/Dgram/Dgram.cpp @@ -24,6 +24,7 @@ // give the name "peer1" as the final argument to one and // only one of the programs so that the test will work properly. +#include "ace/OS_main.h" #include "ace/Reactor.h" #include "ace/Process.h" #include "ace/SOCK_Dgram.h" diff --git a/examples/Reactor/Misc/pingpong.cpp b/examples/Reactor/Misc/pingpong.cpp index 3ccc380739d..0ec3311882b 100644 --- a/examples/Reactor/Misc/pingpong.cpp +++ b/examples/Reactor/Misc/pingpong.cpp @@ -35,12 +35,12 @@ stop it earlier, just hit the control-C sequence and you'll see the same messages. */ -#include "ace/Synch.h" #include "ace/Reactor.h" #include "ace/Pipe.h" #include "ace/Log_Msg.h" #include "ace/ACE.h" #include "ace/Test_and_Set.h" +#include "ace/OS_NS_string.h" #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>; diff --git a/examples/Reactor/Misc/test_early_timeouts.cpp b/examples/Reactor/Misc/test_early_timeouts.cpp index 6cedd05d7f9..910fad2e3f9 100644 --- a/examples/Reactor/Misc/test_early_timeouts.cpp +++ b/examples/Reactor/Misc/test_early_timeouts.cpp @@ -21,6 +21,9 @@ #include "ace/Handle_Set.h" #include "ace/Pipe.h" #include "ace/Log_Msg.h" +#include "ace/Time_Value.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_sys_select.h" ACE_RCSID(Misc, test_early_timeouts, "$Id$") diff --git a/examples/Reactor/Misc/test_time_value.cpp b/examples/Reactor/Misc/test_time_value.cpp index 2f6bf9d461e..c86e3503c19 100644 --- a/examples/Reactor/Misc/test_time_value.cpp +++ b/examples/Reactor/Misc/test_time_value.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "ace/OS.h" #include "ace/streams.h" #include "ace/Log_Msg.h" +#include "ace/Time_Value.h" ACE_RCSID(Misc, test_time_value, "$Id$") diff --git a/examples/Reactor/Multicast/Log_Wrapper.cpp b/examples/Reactor/Multicast/Log_Wrapper.cpp index 94f3361a597..8a11973152c 100644 --- a/examples/Reactor/Multicast/Log_Wrapper.cpp +++ b/examples/Reactor/Multicast/Log_Wrapper.cpp @@ -3,6 +3,10 @@ // client.C #include "Log_Wrapper.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_utsname.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_netdb.h" ACE_RCSID(Multicast, Log_Wrapper, "$Id$") @@ -55,7 +59,7 @@ Log_Wrapper::log_message (Log_Priority type, char *message) this->log_msg_.type = type; this->log_msg_.time = time (0); - this->log_msg_.msg_length = strlen(message)+1; + this->log_msg_.msg_length = ACE_OS::strlen(message)+1; this->log_msg_.sequence_number = htonl(sequence_number_); iovec iovp[2]; diff --git a/examples/Reactor/Multicast/client.cpp b/examples/Reactor/Multicast/client.cpp index 4ffc8fc5ecb..0805e0f107d 100644 --- a/examples/Reactor/Multicast/client.cpp +++ b/examples/Reactor/Multicast/client.cpp @@ -3,6 +3,9 @@ // This program reads in messages from stdin and sends them to a // Log_Wrapper. +#include "ace/OS_main.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" #include "Log_Wrapper.h" diff --git a/examples/Reactor/Multicast/server.cpp b/examples/Reactor/Multicast/server.cpp index 337b07aca36..e2251e317de 100644 --- a/examples/Reactor/Multicast/server.cpp +++ b/examples/Reactor/Multicast/server.cpp @@ -5,12 +5,15 @@ // Listens to multicast address for client log messages. Prints // Mbits/sec received from client. +#include "ace/OS_main.h" #include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Mcast.h" #include "ace/Reactor.h" #include "ace/Log_Msg.h" #include "Log_Wrapper.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(Multicast, server, "$Id$") diff --git a/examples/Reactor/Ntalker/ntalker.cpp b/examples/Reactor/Ntalker/ntalker.cpp index 3b4019044fa..81291afa465 100644 --- a/examples/Reactor/Ntalker/ntalker.cpp +++ b/examples/Reactor/Ntalker/ntalker.cpp @@ -3,6 +3,7 @@ // Listens to multicast address. After first message received, will // listen for 5 more seconds. Prints Mbits/sec received from client. +#include "ace/OS_main.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Mcast.h" #include "ace/Reactor.h" diff --git a/examples/Reactor/Proactor/post_completions.cpp b/examples/Reactor/Proactor/post_completions.cpp index a3e28129d86..72cc2bc5eff 100644 --- a/examples/Reactor/Proactor/post_completions.cpp +++ b/examples/Reactor/Proactor/post_completions.cpp @@ -31,6 +31,7 @@ // // ===================================================================== +#include "ace/OS_main.h" #include "ace/Proactor.h" #include "ace/Synch.h" #include "ace/Task.h" diff --git a/examples/Reactor/Proactor/test_aiocb_ace.cpp b/examples/Reactor/Proactor/test_aiocb_ace.cpp index a554719602b..cd4b585f063 100644 --- a/examples/Reactor/Proactor/test_aiocb_ace.cpp +++ b/examples/Reactor/Proactor/test_aiocb_ace.cpp @@ -32,7 +32,6 @@ // // ============================================================================ -#include "ace/OS.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" diff --git a/examples/Reactor/Proactor/test_cancel.cpp b/examples/Reactor/Proactor/test_cancel.cpp index 15cb12e6106..3a540ff0c20 100644 --- a/examples/Reactor/Proactor/test_cancel.cpp +++ b/examples/Reactor/Proactor/test_cancel.cpp @@ -35,6 +35,7 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/Service_Config.h" #include "ace/Proactor.h" #include "ace/Asynch_IO.h" diff --git a/examples/Reactor/Proactor/test_proactor.cpp b/examples/Reactor/Proactor/test_proactor.cpp index 53c8db49ca5..a2366fbdd79 100644 --- a/examples/Reactor/Proactor/test_proactor.cpp +++ b/examples/Reactor/Proactor/test_proactor.cpp @@ -18,6 +18,7 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/Service_Config.h" #include "ace/Proactor.h" #include "ace/Asynch_IO.h" @@ -30,6 +31,7 @@ #include "ace/Message_Block.h" #include "ace/Get_Opt.h" #include "ace/streams.h" +#include "ace/OS_NS_sys_stat.h" ACE_RCSID(Proactor, test_proactor, "$Id$") diff --git a/examples/Reactor/Proactor/test_udp_proactor.cpp b/examples/Reactor/Proactor/test_udp_proactor.cpp index 84f1bd8ad7e..8ce6e8ac481 100644 --- a/examples/Reactor/Proactor/test_udp_proactor.cpp +++ b/examples/Reactor/Proactor/test_udp_proactor.cpp @@ -19,6 +19,7 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/Proactor.h" #include "ace/Asynch_IO.h" #include "ace/INET_Addr.h" diff --git a/examples/Reactor/WFMO_Reactor/APC.cpp b/examples/Reactor/WFMO_Reactor/APC.cpp index 77233099662..ff1cbdd8233 100644 --- a/examples/Reactor/WFMO_Reactor/APC.cpp +++ b/examples/Reactor/WFMO_Reactor/APC.cpp @@ -19,7 +19,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Reactor/WFMO_Reactor/Abandoned.cpp b/examples/Reactor/WFMO_Reactor/Abandoned.cpp index 5feca2edd61..6f1466f1ef6 100644 --- a/examples/Reactor/WFMO_Reactor/Abandoned.cpp +++ b/examples/Reactor/WFMO_Reactor/Abandoned.cpp @@ -18,7 +18,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp b/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp index b481c4929bd..50e8fab847f 100644 --- a/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp +++ b/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp @@ -18,7 +18,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Reactor/WFMO_Reactor/Exceptions.cpp b/examples/Reactor/WFMO_Reactor/Exceptions.cpp index d87069be9b3..c433f8496ae 100644 --- a/examples/Reactor/WFMO_Reactor/Exceptions.cpp +++ b/examples/Reactor/WFMO_Reactor/Exceptions.cpp @@ -23,7 +23,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/examples/Reactor/WFMO_Reactor/Multithreading.cpp index efe1b25e4e0..23bc2a148b1 100644 --- a/examples/Reactor/WFMO_Reactor/Multithreading.cpp +++ b/examples/Reactor/WFMO_Reactor/Multithreading.cpp @@ -22,7 +22,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Reactor/WFMO_Reactor/Registration.cpp b/examples/Reactor/WFMO_Reactor/Registration.cpp index 1a857350868..81c4400c3bd 100644 --- a/examples/Reactor/WFMO_Reactor/Registration.cpp +++ b/examples/Reactor/WFMO_Reactor/Registration.cpp @@ -33,7 +33,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp b/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp index 52cb536725a..8e6a023ce1f 100644 --- a/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp +++ b/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp @@ -18,7 +18,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Reactor/WFMO_Reactor/Removals.cpp b/examples/Reactor/WFMO_Reactor/Removals.cpp index 3e9d4809f7f..50aed5b36fc 100644 --- a/examples/Reactor/WFMO_Reactor/Removals.cpp +++ b/examples/Reactor/WFMO_Reactor/Removals.cpp @@ -20,7 +20,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp b/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp index 46a670e169e..227fc851ba9 100644 --- a/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp +++ b/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp @@ -18,7 +18,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Reactor/WFMO_Reactor/Talker.cpp b/examples/Reactor/WFMO_Reactor/Talker.cpp index f2326903e02..4e2a8c96e8c 100644 --- a/examples/Reactor/WFMO_Reactor/Talker.cpp +++ b/examples/Reactor/WFMO_Reactor/Talker.cpp @@ -132,7 +132,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Reactor/WFMO_Reactor/Timeouts.cpp b/examples/Reactor/WFMO_Reactor/Timeouts.cpp index d88a5bd232b..b157ccab3e3 100644 --- a/examples/Reactor/WFMO_Reactor/Timeouts.cpp +++ b/examples/Reactor/WFMO_Reactor/Timeouts.cpp @@ -26,7 +26,7 @@ #include "ace/Reactor.h" #include "ace/Service_Config.h" -#include "ace/OS.h" +#include "ace/OS_main.h" ACE_RCSID(WFMO_Reactor, Timeouts, "$Id$") diff --git a/examples/Reactor/WFMO_Reactor/Window_Messages.cpp b/examples/Reactor/WFMO_Reactor/Window_Messages.cpp index df247025384..db3eddaa37e 100644 --- a/examples/Reactor/WFMO_Reactor/Window_Messages.cpp +++ b/examples/Reactor/WFMO_Reactor/Window_Messages.cpp @@ -19,7 +19,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Registry/test_registry_iterator.cpp b/examples/Registry/test_registry_iterator.cpp index 1585e87ce6e..4d96dcc7a78 100644 --- a/examples/Registry/test_registry_iterator.cpp +++ b/examples/Registry/test_registry_iterator.cpp @@ -7,7 +7,7 @@ // // This examples points the cool iterators in ACE_Registry -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Registry/test_registry_update.cpp b/examples/Registry/test_registry_update.cpp index bc732d95807..9d64435e7a8 100644 --- a/examples/Registry/test_registry_update.cpp +++ b/examples/Registry/test_registry_update.cpp @@ -13,7 +13,7 @@ // Note that this application will not work with remote registries // if used with the CURRENT_USER predefined registry. -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_WIN32) diff --git a/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp index 7cb5b719a1b..9918ecfdc28 100644 --- a/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp @@ -3,10 +3,13 @@ // Tests out the broadcast service of the // Internet domain IPC-SAP dgram abstraction. +#include "ace/OS_main.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Bcast.h" #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" ACE_RCSID(client, broadcast_client_test, "$Id$") @@ -51,7 +54,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) static char buf[] = "testing socket broadcast service"; - if (sd.send (buf, strlen (buf), broadcast_port_number) == -1) + if (sd.send (buf, ACE_OS::strlen (buf), broadcast_port_number) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "can't send broadcast"), -1); return 0; diff --git a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp index fb9769dd458..08b5524c947 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp @@ -2,11 +2,13 @@ // Tests out the UNIX domain IPC-SAP abstraction. -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/LSOCK_CODgram.h" #include "ace/LSOCK_Dgram.h" #include "ace/UNIX_Addr.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(client, local_dgram_client_test, "$Id$") diff --git a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp index 51b566c24e9..eaf416c9dbf 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp @@ -3,6 +3,7 @@ // Send a file through ACE_FIFO communication channel by // breaking it (the file) into pieces. +#include "ace/OS_main.h" #include "ace/Mem_Map.h" #include "ace/FIFO_Send_Msg.h" #include "ace/Get_Opt.h" diff --git a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp index 08d00e325eb..5671bd73224 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp @@ -4,7 +4,7 @@ // pipes and then ships certain ends over to the server to act as a // filter! -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/LSOCK_Connector.h" #include "ace/UNIX_Addr.h" #include "ace/Get_Opt.h" diff --git a/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp index a565c8b4f15..77406f9bada 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp @@ -3,6 +3,7 @@ // Send a file through ACE_SPIPE communication channel by // breaking it (the file) into pieces. +#include "ace/OS_main.h" #include "ace/Mem_Map.h" #include "ace/SPIPE_Connector.h" #include "ace/Get_Opt.h" diff --git a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp index 9bb8dbf128d..a26d988bd05 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp @@ -2,7 +2,7 @@ // Tests out the UNIX domain IPC-SAP abstraction. -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/LSOCK_Connector.h" #include "ace/UNIX_Addr.h" #include "ace/Get_Opt.h" diff --git a/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp index 7640824a36e..400865ad7bb 100644 --- a/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp @@ -2,6 +2,7 @@ // Tests out the Internet domain IPC-SAP dgram abstraction. +#include "ace/OS_main.h" #include "ace/Mem_Map.h" #include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" diff --git a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp index 9b3327e07e0..efefebbed9e 100644 --- a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp @@ -2,6 +2,8 @@ // Test program for the INET IPC-SAPs... +#include "ace/OS_main.h" +#include "ace/OS_NS_string.h" #include "ace/SOCK_Connector.h" #include "ace/INET_Addr.h" #include "ace/Get_Opt.h" diff --git a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp index 636223e2349..9fd5b3c00b6 100644 --- a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp @@ -2,6 +2,8 @@ // Test program for the INET IPC-SAPs... +#include "ace/OS_main.h" +#include "ace/OS_NS_string.h" #include "ace/Mem_Map.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_CODgram.h" diff --git a/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp index 6c0c3fb9d1d..c425d3210ea 100644 --- a/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp @@ -2,6 +2,7 @@ // Test program for the INET ACE_TLI-SAPs... +#include "ace/OS_main.h" #include "ace/Mem_Map.h" #include "ace/TLI_Connector.h" #include "ace/INET_Addr.h" diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i index 2d960f3e9dd..d27f612bc8a 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" ACE_INLINE Handle_Broadcast::~Handle_Broadcast (void) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i index 4865b5eaa36..df441aff0ee 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" ACE_INLINE Handle_L_CODgram::Handle_L_CODgram (void) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i index 295bdd7d76d..325acada54a 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" ACE_INLINE Handle_L_Dgram::Handle_L_Dgram (void) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i index 930b4390fd8..e1a47df19fc 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" ACE_INLINE Handle_L_FIFO::Handle_L_FIFO (void) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i index a48081058e1..35c27f7c9cd 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" ACE_INLINE Handle_L_Pipe::~Handle_L_Pipe (void) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i index 465eb3e2fbe..7c59a4b61ff 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i @@ -2,6 +2,8 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_time.h" ACE_INLINE Handle_L_Stream::~Handle_L_Stream (void) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i index 505735ba3ed..02408f58a64 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" ACE_INLINE Handle_R_Dgram::Handle_R_Dgram (void) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i index f6599713678..476521b8c27 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i @@ -3,6 +3,8 @@ #include "ace/Get_Opt.h" #include "ace/WFMO_Reactor.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_time.h" ACE_INLINE Handle_R_Stream::Handle_R_Stream (void) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp index c5c1cf3e166..58f6ef15e1c 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp +++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp @@ -16,6 +16,8 @@ ACE_RCSID(server, Handle_Thr_Stream, "$Id$") #include "Handle_Thr_Stream.i" #endif /* __ACE_INLINE__ */ +#include "ace/OS_NS_time.h" + // Shorthand names. #define SVH SVC_HANDLER #define PR_AC_1 ACE_PEER_ACCEPTOR_1 diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i index 29f4be5d7d1..94aaf48f74f 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i @@ -3,6 +3,7 @@ #include "ace/Service_Config.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" ACE_INLINE Handle_Timeout::Handle_Timeout (void): count (0) diff --git a/examples/Service_Configurator/Misc/main.cpp b/examples/Service_Configurator/Misc/main.cpp index 3bb4abd62a6..ab679d47930 100644 --- a/examples/Service_Configurator/Misc/main.cpp +++ b/examples/Service_Configurator/Misc/main.cpp @@ -18,6 +18,7 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/Service_Config.h" #include "ace/ARGV.h" #include "ace/Log_Msg.h" diff --git a/examples/Shared_Malloc/Options.cpp b/examples/Shared_Malloc/Options.cpp index 5b898cb2b83..6ff3244bfe3 100644 --- a/examples/Shared_Malloc/Options.cpp +++ b/examples/Shared_Malloc/Options.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "Options.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" ACE_RCSID(Shared_Malloc, Options, "$Id$") diff --git a/examples/Shared_Malloc/Options.h b/examples/Shared_Malloc/Options.h index c96cd5fb322..b2f0fdfa8af 100644 --- a/examples/Shared_Malloc/Options.h +++ b/examples/Shared_Malloc/Options.h @@ -4,7 +4,7 @@ #ifndef _OPTIONS #define _OPTIONS -#include "ace/OS.h" +#include "ace/os_include/os_stddef.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/examples/Shared_Malloc/test_malloc.cpp b/examples/Shared_Malloc/test_malloc.cpp index 8ede38848d1..ff9ee9e1eac 100644 --- a/examples/Shared_Malloc/test_malloc.cpp +++ b/examples/Shared_Malloc/test_malloc.cpp @@ -5,6 +5,7 @@ #include "ace/Thread.h" #include "ace/Thread_Manager.h" +#include "ace/OS_NS_sys_wait.h" #include "Malloc.h" #include "Options.h" diff --git a/examples/Shared_Memory/test_MM.cpp b/examples/Shared_Memory/test_MM.cpp index f26d58f4310..5a7688af45b 100644 --- a/examples/Shared_Memory/test_MM.cpp +++ b/examples/Shared_Memory/test_MM.cpp @@ -2,6 +2,9 @@ #include "ace/Shared_Memory_MM.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_errno.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_stdlib.h" ACE_RCSID(Shared_Memory, test_MM, "$Id$") diff --git a/examples/Shared_Memory/test_SV.cpp b/examples/Shared_Memory/test_SV.cpp index f341f976639..b7e8a36adfc 100644 --- a/examples/Shared_Memory/test_SV.cpp +++ b/examples/Shared_Memory/test_SV.cpp @@ -2,6 +2,7 @@ #include "ace/Shared_Memory_SV.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(Shared_Memory, test_SV, "$Id$") diff --git a/examples/Smart_Pointers/Widget_Part_Impl.cpp b/examples/Smart_Pointers/Widget_Part_Impl.cpp index ffb42fe3a43..0e4e496f180 100644 --- a/examples/Smart_Pointers/Widget_Part_Impl.cpp +++ b/examples/Smart_Pointers/Widget_Part_Impl.cpp @@ -14,6 +14,7 @@ #include "ace/Log_Msg.h" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Unbounded_Queue.h" +#include "ace/Null_Mutex.h" Widget_Part_Impl::Widget_Part_Impl (Widget *owner, const char* name, int size) : owner_ (owner), diff --git a/examples/Smart_Pointers/gadget_test.cpp b/examples/Smart_Pointers/gadget_test.cpp index 95fd5d89b87..1577d860255 100644 --- a/examples/Smart_Pointers/gadget_test.cpp +++ b/examples/Smart_Pointers/gadget_test.cpp @@ -9,7 +9,6 @@ */ //============================================================================= -#include "ace/OS.h" #include "ace/Auto_Ptr.h" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Unbounded_Queue.h" diff --git a/examples/Smart_Pointers/widget_test.cpp b/examples/Smart_Pointers/widget_test.cpp index d90692371ee..d94b9ed05f8 100644 --- a/examples/Smart_Pointers/widget_test.cpp +++ b/examples/Smart_Pointers/widget_test.cpp @@ -9,7 +9,6 @@ */ //============================================================================= -#include "ace/OS.h" #include "ace/Auto_Ptr.h" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Unbounded_Queue.h" diff --git a/examples/Synch/proc_sema.cpp b/examples/Synch/proc_sema.cpp index 3666b552cd8..13b53895ce4 100644 --- a/examples/Synch/proc_sema.cpp +++ b/examples/Synch/proc_sema.cpp @@ -1,9 +1,11 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/Process_Semaphore.h" #include "ace/Synch_T.h" #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_unistd.h" int producer (ACE_SYNCH_PROCESS_SEMAPHORE &sema, int iter) diff --git a/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp b/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp index 9a6020d590c..d0ccc9840bc 100644 --- a/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp @@ -4,6 +4,7 @@ #include "test.h" #include "ace/streams.h" #include "ace/Malloc.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(SV_Message_Queues, MQ_Client, "$Id$") diff --git a/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp index 7b6bca929f8..dd7a9573f92 100644 --- a/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp @@ -4,6 +4,8 @@ #include "ace/SV_Message_Queue.h" #include "ace/streams.h" #include "test.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(SV_Message_Queues, MQ_Server, "$Id$") diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp index 2310029816d..cbd1ed90268 100644 --- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp @@ -4,6 +4,8 @@ #include "ace/streams.h" #include "ace/Log_Msg.h" #include "test.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(SV_Message_Queues, TMQ_Client, "$Id$") diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp index 373c92dae79..3e789a76867 100644 --- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp @@ -6,6 +6,8 @@ #include "test.h" #include "ace/streams.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(SV_Message_Queues, TMQ_Server, "$Id$") diff --git a/examples/System_V_IPC/SV_Message_Queues/test.h b/examples/System_V_IPC/SV_Message_Queues/test.h index b3da2877bc7..f17cf11c63e 100644 --- a/examples/System_V_IPC/SV_Message_Queues/test.h +++ b/examples/System_V_IPC/SV_Message_Queues/test.h @@ -1,7 +1,7 @@ /* -*- C++ -*- */ // $Id$ -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -20,17 +20,17 @@ public: const char user[] = "", const char text[] = ""): pid_ (p) { - ::strncpy (this->username_, user, 9); - ::strncpy (this->mtext_, text, MSGSZ); + ACE_OS::strncpy (this->username_, user, 9); + ACE_OS::strncpy (this->mtext_, text, MSGSZ); } long pid (void) { return this->pid_; } void pid (long p) { this->pid_ = p; } char *user (void) { return this->username_; } - void user (char user[]) { ::strncpy (this->username_, user, 9); } + void user (char user[]) { ACE_OS::strncpy (this->username_, user, 9); } char *text (void) { return this->mtext_; } - void text (char text[]) { ::strncpy (this->mtext_, text, MSGSZ); } - int length (void) { return sizeof *this - sizeof this->mtext_ + ::strlen (this->mtext_) + 1; } + void text (char text[]) { ACE_OS::strncpy (this->mtext_, text, MSGSZ); } + int length (void) { return sizeof *this - sizeof this->mtext_ + ACE_OS::strlen (this->mtext_) + 1; } protected: long pid_; diff --git a/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp b/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp index 39157552b93..981663630f0 100644 --- a/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp +++ b/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp @@ -3,6 +3,9 @@ #include "ace/SV_Shared_Memory.h" #include "ace/Log_Msg.h" #include "SV_Shared_Memory_Test.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(SV_Shared_Memory, SV_Shared_Memory_Test, "$Id$") diff --git a/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.h b/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.h index 4e8cd9b9d13..3cfff4672b9 100644 --- a/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.h +++ b/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.h @@ -1,7 +1,7 @@ /* -*- C++ -*- */ // $Id$ -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/examples/Threads/auto_event.cpp b/examples/Threads/auto_event.cpp index 4c7ebcb2392..3fc6f082045 100644 --- a/examples/Threads/auto_event.cpp +++ b/examples/Threads/auto_event.cpp @@ -7,8 +7,9 @@ // by the writer. The writer thread calculates the value and signals // the reader when the calculation completes. +#include "ace/OS_main.h" #include "ace/Service_Config.h" -#include "ace/Synch.h" +#include "ace/Auto_Event.h" #include "ace/Singleton.h" #include "ace/Thread_Manager.h" diff --git a/examples/Threads/barrier1.cpp b/examples/Threads/barrier1.cpp index e6d8c8f17dc..4d3762b1eb6 100644 --- a/examples/Threads/barrier1.cpp +++ b/examples/Threads/barrier1.cpp @@ -3,7 +3,8 @@ // This test program illustrates how the ACE barrier synchronization // mechanisms work. -#include "ace/Synch.h" +#include "ace/OS_main.h" +#include "ace/Barrier.h" #include "ace/Thread_Manager.h" #include "ace/Service_Config.h" diff --git a/examples/Threads/barrier2.cpp b/examples/Threads/barrier2.cpp index 13d152da7fe..6b3e3df9b3a 100644 --- a/examples/Threads/barrier2.cpp +++ b/examples/Threads/barrier2.cpp @@ -10,6 +10,7 @@ // should work with this flag disabled! The BARRIER_TYPE is supposed // to enable/disable barrier sync on each svc a worker has done. +#include "ace/OS_main.h" #include "ace/Task.h" #include "ace/Service_Config.h" diff --git a/examples/Threads/cancel.cpp b/examples/Threads/cancel.cpp index 05f56101f31..4d2b741839a 100644 --- a/examples/Threads/cancel.cpp +++ b/examples/Threads/cancel.cpp @@ -3,6 +3,7 @@ // Test out the cooperative thread cancellation mechanisms provided by // the ACE_Thread_Manager. +#include "ace/OS_main.h" #include "ace/Service_Config.h" #include "ace/Thread_Manager.h" diff --git a/examples/Threads/future1.cpp b/examples/Threads/future1.cpp index 6823b27625a..8151f236e7b 100644 --- a/examples/Threads/future1.cpp +++ b/examples/Threads/future1.cpp @@ -17,9 +17,10 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/ACE.h" #include "ace/Task.h" -#include "ace/Synch.h" +#include "ace/Thread_Mutex.h" #include "ace/Message_Queue.h" #include "ace/Future.h" #include "ace/Method_Request.h" diff --git a/examples/Threads/future2.cpp b/examples/Threads/future2.cpp index 6178396ec61..2b64d5e0094 100644 --- a/examples/Threads/future2.cpp +++ b/examples/Threads/future2.cpp @@ -25,9 +25,9 @@ // the tests so they are more modular. // ============================================================================ +#include "ace/OS_main.h" #include "ace/ACE.h" #include "ace/Task.h" -#include "ace/Synch.h" #include "ace/Message_Queue.h" #include "ace/Future.h" #include "ace/Method_Request.h" diff --git a/examples/Threads/manual_event.cpp b/examples/Threads/manual_event.cpp index 6871fbadeea..75287e02620 100644 --- a/examples/Threads/manual_event.cpp +++ b/examples/Threads/manual_event.cpp @@ -11,8 +11,10 @@ // ACE_Manual_Event is use to synch with other // threads. ACE_Manual_Event::signal() is used for broadcasting. +#include "ace/OS_main.h" #include "ace/Service_Config.h" -#include "ace/Synch.h" +#include "ace/Thread_Mutex.h" +#include "ace/Manual_Event.h" #include "ace/Thread_Manager.h" #include "ace/Atomic_Op.h" diff --git a/examples/Threads/process_manager.cpp b/examples/Threads/process_manager.cpp index 94b5eb23b35..08058ef2cc9 100644 --- a/examples/Threads/process_manager.cpp +++ b/examples/Threads/process_manager.cpp @@ -26,6 +26,7 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/Service_Config.h" #include "ace/Thread_Manager.h" #include "ace/Process_Manager.h" diff --git a/examples/Threads/process_mutex.cpp b/examples/Threads/process_mutex.cpp index 61c27fd5cdb..bbb03c08d0b 100644 --- a/examples/Threads/process_mutex.cpp +++ b/examples/Threads/process_mutex.cpp @@ -3,7 +3,9 @@ // This program tests ACE_Process_Mutexes. To run it, open 3 or 4 // windows and run this program in each window... -#include "ace/Synch.h" +#include "ace/OS_main.h" +#include "ace/OS_NS_unistd.h" +#include "ace/Thread_Mutex.h" #include "ace/Signal.h" #include "ace/Log_Msg.h" #include "ace/Process_Mutex.h" diff --git a/examples/Threads/process_semaphore.cpp b/examples/Threads/process_semaphore.cpp index 43e57dacd4c..1a80e5ebe0d 100644 --- a/examples/Threads/process_semaphore.cpp +++ b/examples/Threads/process_semaphore.cpp @@ -3,7 +3,8 @@ // This program tests ACE_Process_Semaphore. To run it, open 3 or 4 // windows and run this program in each window... -#include "ace/Synch.h" +#include "ace/OS_main.h" +#include "ace/OS_NS_unistd.h" #include "ace/Signal.h" #include "ace/Log_Msg.h" #include "ace/Process_Semaphore.h" diff --git a/examples/Threads/reader_writer.cpp b/examples/Threads/reader_writer.cpp index 8332eb93efa..57846a563ff 100644 --- a/examples/Threads/reader_writer.cpp +++ b/examples/Threads/reader_writer.cpp @@ -3,7 +3,7 @@ // This test program verifies the functionality of the ACE_OS // implementation of readers/writer locks on Win32 and Posix pthreads. -#include "ace/Synch.h" +#include "ace/OS_main.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" diff --git a/examples/Threads/recursive_mutex.cpp b/examples/Threads/recursive_mutex.cpp index ed7a602826c..ca1296f787e 100644 --- a/examples/Threads/recursive_mutex.cpp +++ b/examples/Threads/recursive_mutex.cpp @@ -3,6 +3,7 @@ // This test program verifies the functionality of the ACE_OS // implementation of recursive mutexes on Win32 and Posix pthreads. +#include "ace/OS_main.h" #include "ace/Service_Config.h" #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" diff --git a/examples/Threads/task_five.cpp b/examples/Threads/task_five.cpp index c43dd88f1b4..8f96ee3420e 100644 --- a/examples/Threads/task_five.cpp +++ b/examples/Threads/task_five.cpp @@ -18,8 +18,10 @@ // ============================================================================ +#include "ace/OS_main.h" #include "ace/Thread_Manager.h" #include "ace/Task.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(Threads, task_five, "$Id$") diff --git a/examples/Threads/task_four.cpp b/examples/Threads/task_four.cpp index d13330b96df..c7e691d531e 100644 --- a/examples/Threads/task_four.cpp +++ b/examples/Threads/task_four.cpp @@ -31,6 +31,7 @@ // // test_task [num_tasks] [num_threads] [num_iterations] +#include "ace/OS_main.h" #include "ace/Task.h" #include "ace/Service_Config.h" diff --git a/examples/Threads/task_one.cpp b/examples/Threads/task_one.cpp index 734c0863712..ea4fd71dcf8 100644 --- a/examples/Threads/task_one.cpp +++ b/examples/Threads/task_one.cpp @@ -5,6 +5,7 @@ // ACE_Thread_Manager. It is instructive to compare this with the // test_barrier.cpp test to see how they differ. +#include "ace/OS_main.h" #include "ace/Task.h" #include "ace/Service_Config.h" diff --git a/examples/Threads/task_three.cpp b/examples/Threads/task_three.cpp index 23434dec97a..ed06a6719ff 100644 --- a/examples/Threads/task_three.cpp +++ b/examples/Threads/task_three.cpp @@ -11,6 +11,7 @@ // ACE_LOG_MSG->msg_ostream (out_stream); // } +#include "ace/OS_main.h" #include "ace/Reactor.h" #include "ace/Service_Config.h" #include "ace/Task.h" diff --git a/examples/Threads/task_two.cpp b/examples/Threads/task_two.cpp index 81d829f7990..b4c703a8ed8 100644 --- a/examples/Threads/task_two.cpp +++ b/examples/Threads/task_two.cpp @@ -4,6 +4,7 @@ // zillions of tasks and then wait for them using both polling and the // ACE Thread Manager. +#include "ace/OS_main.h" #include "ace/Task.h" #include "ace/Service_Config.h" diff --git a/examples/Threads/thread_manager.cpp b/examples/Threads/thread_manager.cpp index 37b017df439..2528cda57b7 100644 --- a/examples/Threads/thread_manager.cpp +++ b/examples/Threads/thread_manager.cpp @@ -5,6 +5,7 @@ // suspension and resumption, and cooperative thread cancellation // mechanisms. +#include "ace/OS_main.h" #include "ace/Service_Config.h" #include "ace/Thread_Manager.h" diff --git a/examples/Threads/thread_pool.cpp b/examples/Threads/thread_pool.cpp index bb45c652e90..9f37f510ecb 100644 --- a/examples/Threads/thread_pool.cpp +++ b/examples/Threads/thread_pool.cpp @@ -11,11 +11,10 @@ // Dorn <Karlheinz.Dorn@med.siemens.de>. It was modified to utilize // more ACE features by Doug Schmidt <schmidt@cs.wustl.edu>. +#include "ace/OS_main.h" #include "ace/Task.h" #include "ace/Service_Config.h" -#include "ace/Task.h" - ACE_RCSID(Threads, thread_pool, "$Id$") #if defined (ACE_HAS_THREADS) diff --git a/examples/Threads/thread_specific.cpp b/examples/Threads/thread_specific.cpp index 13df67404c4..e04b1da748b 100644 --- a/examples/Threads/thread_specific.cpp +++ b/examples/Threads/thread_specific.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/Service_Config.h" #include "ace/Thread_Manager.h" #include "ace/Synch.h" diff --git a/examples/Threads/token.cpp b/examples/Threads/token.cpp index b87960ee072..bbda579369b 100644 --- a/examples/Threads/token.cpp +++ b/examples/Threads/token.cpp @@ -2,8 +2,10 @@ // Test out the ACE Token class. +#include "ace/OS_main.h" #include "ace/Token.h" #include "ace/Task.h" +#include "ace/OS_NS_time.h" ACE_RCSID(Threads, token, "$Id$") diff --git a/examples/Threads/tss1.cpp b/examples/Threads/tss1.cpp index b958a367396..77fd622b831 100644 --- a/examples/Threads/tss1.cpp +++ b/examples/Threads/tss1.cpp @@ -21,6 +21,7 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/Service_Config.h" #include "ace/Synch.h" #include "ace/Task.h" diff --git a/examples/Threads/tss2.cpp b/examples/Threads/tss2.cpp index 58e3f5f5ece..59b52fe59ca 100644 --- a/examples/Threads/tss2.cpp +++ b/examples/Threads/tss2.cpp @@ -17,6 +17,7 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/Thread.h" #include "ace/Log_Msg.h" #include "ace/Atomic_Op.h" diff --git a/examples/Timer_Queue/main_async.cpp b/examples/Timer_Queue/main_async.cpp index 62d3b629ab5..7cb90111fde 100644 --- a/examples/Timer_Queue/main_async.cpp +++ b/examples/Timer_Queue/main_async.cpp @@ -29,6 +29,7 @@ information */ #endif /* _MSC_VER */ +#include "ace/OS_main.h" #include "ace/Auto_Ptr.h" #include "Driver.h" #include "Async_Timer_Queue_Test.h" diff --git a/examples/Timer_Queue/main_reactor.cpp b/examples/Timer_Queue/main_reactor.cpp index d69d415805a..76088bc5287 100644 --- a/examples/Timer_Queue/main_reactor.cpp +++ b/examples/Timer_Queue/main_reactor.cpp @@ -29,6 +29,7 @@ information */ #endif /* _MSC_VER */ +#include "ace/OS_main.h" #include "ace/Auto_Ptr.h" #include "Reactor_Timer_Queue_Test.h" #include "Driver.h" diff --git a/examples/Timer_Queue/main_thread.cpp b/examples/Timer_Queue/main_thread.cpp index 5a0493fb45b..3f8aba5866e 100644 --- a/examples/Timer_Queue/main_thread.cpp +++ b/examples/Timer_Queue/main_thread.cpp @@ -29,6 +29,7 @@ information */ #endif /* _MSC_VER */ +#include "ace/OS_main.h" #include "ace/Auto_Ptr.h" #include "Driver.h" #include "Thread_Timer_Queue_Test.h" diff --git a/examples/Web_Crawler/Options.cpp b/examples/Web_Crawler/Options.cpp index b9c7585a807..c4e96acb77d 100644 --- a/examples/Web_Crawler/Options.cpp +++ b/examples/Web_Crawler/Options.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "URL_Addr.h" #include "Options.h" +#include "ace/OS_NS_string.h" ACE_RCSID(Web_Crawler, Options, "$Id$") diff --git a/examples/Web_Crawler/Options.h b/examples/Web_Crawler/Options.h index 45b8bfd2f71..e7cdbb336bf 100644 --- a/examples/Web_Crawler/Options.h +++ b/examples/Web_Crawler/Options.h @@ -18,7 +18,7 @@ #define _OPTIONS_H #include "ace/Singleton.h" -#include "ace/Synch.h" +#include "ace/Time_Value.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/examples/Web_Crawler/URL_Addr.cpp b/examples/Web_Crawler/URL_Addr.cpp index 259fb05517e..b64cf5eb3b6 100644 --- a/examples/Web_Crawler/URL_Addr.cpp +++ b/examples/Web_Crawler/URL_Addr.cpp @@ -2,6 +2,8 @@ #include "URL_Addr.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(Web_Crawler, URL_Addr, "$Id$") diff --git a/examples/Web_Crawler/URL_Status.h b/examples/Web_Crawler/URL_Status.h index fc916a4eee5..c6b56042b24 100644 --- a/examples/Web_Crawler/URL_Status.h +++ b/examples/Web_Crawler/URL_Status.h @@ -17,7 +17,7 @@ #ifndef _URL_STATUS_H #define _URL_STATUS_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/netsvcs/clients/Logger/direct_logging.cpp b/netsvcs/clients/Logger/direct_logging.cpp index cdbcafef39a..d1880808e13 100644 --- a/netsvcs/clients/Logger/direct_logging.cpp +++ b/netsvcs/clients/Logger/direct_logging.cpp @@ -6,6 +6,7 @@ #include "ace/SOCK_Connector.h" #include "ace/Log_Record.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_time.h" ACE_RCSID(Logger, direct_logging, "$Id$") diff --git a/netsvcs/clients/Logger/indirect_logging.cpp b/netsvcs/clients/Logger/indirect_logging.cpp index 1739f0a668f..2bec071fdaf 100644 --- a/netsvcs/clients/Logger/indirect_logging.cpp +++ b/netsvcs/clients/Logger/indirect_logging.cpp @@ -5,7 +5,8 @@ // them to the Server Logging Daemon. If there is no Server Logging // Daemon, the logging records will be written to stderr. -#include "ace/OS.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_stdlib.h" #include "ace/Log_Msg.h" ACE_RCSID(Logger, indirect_logging, "$Id$") diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp index 72c7e9b8494..5f8cb56c3fa 100644 --- a/netsvcs/clients/Naming/Client/Client_Test.cpp +++ b/netsvcs/clients/Naming/Client/Client_Test.cpp @@ -7,6 +7,7 @@ #include "ace/Dynamic_Service.h" #include "ace/Thread_Manager.h" #include "Client_Test.h" +#include "ace/OS_NS_signal.h" ACE_RCSID(Client, Client_Test, "$Id$") diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp index ef7b26ba5d7..da41e3ec1f7 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp +++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp @@ -6,6 +6,7 @@ #include "ace/Thread_Manager.h" #include "ace/streams.h" /* Because dump () uses ofstream. */ #include "Dump_Restore.h" +#include "ace/OS_NS_signal.h" ACE_RCSID(Dump_Restore, Dump_Restore, "$Id$") diff --git a/netsvcs/clients/Tokens/collection/collection.cpp b/netsvcs/clients/Tokens/collection/collection.cpp index c6d223ed095..8df0ae625fc 100644 --- a/netsvcs/clients/Tokens/collection/collection.cpp +++ b/netsvcs/clients/Tokens/collection/collection.cpp @@ -19,7 +19,6 @@ // // ============================================================================ -#include "ace/OS.h" #include "ace/Get_Opt.h" #include "ace/Local_Tokens.h" #include "ace/Token_Collection.h" diff --git a/netsvcs/clients/Tokens/collection/rw_locks.cpp b/netsvcs/clients/Tokens/collection/rw_locks.cpp index 2a64f8d9786..2670f99214f 100644 --- a/netsvcs/clients/Tokens/collection/rw_locks.cpp +++ b/netsvcs/clients/Tokens/collection/rw_locks.cpp @@ -1,6 +1,5 @@ // $Id$ -#include "ace/OS.h" #include "ace/Get_Opt.h" #include "ace/Local_Tokens.h" #include "ace/Remote_Tokens.h" diff --git a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp index 46a9daabf80..e1a9d60ccd6 100644 --- a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp +++ b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp @@ -15,7 +15,6 @@ // // ============================================================================ -#include "ace/OS.h" #include "ace/Token_Manager.h" #include "ace/Remote_Tokens.h" #include "ace/Thread.h" diff --git a/netsvcs/clients/Tokens/invariant/invariant.cpp b/netsvcs/clients/Tokens/invariant/invariant.cpp index f5c223c3568..cda1f54f6f7 100644 --- a/netsvcs/clients/Tokens/invariant/invariant.cpp +++ b/netsvcs/clients/Tokens/invariant/invariant.cpp @@ -15,7 +15,6 @@ // // ============================================================================ -#include "ace/OS.h" #include "ace/Get_Opt.h" #include "ace/Singleton.h" #include "ace/Thread_Manager.h" diff --git a/netsvcs/clients/Tokens/manual/manual.cpp b/netsvcs/clients/Tokens/manual/manual.cpp index 9574fc7edb6..04f46d0b3da 100644 --- a/netsvcs/clients/Tokens/manual/manual.cpp +++ b/netsvcs/clients/Tokens/manual/manual.cpp @@ -16,7 +16,6 @@ // // ============================================================================ -#include "ace/OS.h" #include "ace/Get_Opt.h" #include "ace/Local_Tokens.h" #include "ace/Remote_Tokens.h" diff --git a/netsvcs/clients/Tokens/mutex/test_mutex.cpp b/netsvcs/clients/Tokens/mutex/test_mutex.cpp index c291981789d..73a33cb6c6e 100644 --- a/netsvcs/clients/Tokens/mutex/test_mutex.cpp +++ b/netsvcs/clients/Tokens/mutex/test_mutex.cpp @@ -15,7 +15,6 @@ // // ============================================================================ -#include "ace/OS.h" #include "ace/Get_Opt.h" #include "ace/Local_Tokens.h" #include "ace/Remote_Tokens.h" diff --git a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp index 098d2bd9d84..5d0d95af876 100644 --- a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp +++ b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp @@ -17,7 +17,6 @@ // // ============================================================================ -#include "ace/OS.h" #include "ace/Get_Opt.h" #include "ace/Local_Tokens.h" #include "ace/Remote_Tokens.h" diff --git a/netsvcs/lib/Base_Optimizer.h b/netsvcs/lib/Base_Optimizer.h index 72b83e9f456..1869531cba9 100644 --- a/netsvcs/lib/Base_Optimizer.h +++ b/netsvcs/lib/Base_Optimizer.h @@ -17,7 +17,7 @@ #ifndef BASE_OPTIMIZER_H #define BASE_OPTIMIZER_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/netsvcs/lib/Log_Message_Receiver.h b/netsvcs/lib/Log_Message_Receiver.h index 784fe07cec7..6be17dba751 100644 --- a/netsvcs/lib/Log_Message_Receiver.h +++ b/netsvcs/lib/Log_Message_Receiver.h @@ -23,7 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Guard_T.h" // ==========================================================================// //------------- General Requirements on a Log Message Receiver --------------// diff --git a/netsvcs/lib/Server_Logging_Handler.h b/netsvcs/lib/Server_Logging_Handler.h index f314a877d5d..e6b017ffd06 100644 --- a/netsvcs/lib/Server_Logging_Handler.h +++ b/netsvcs/lib/Server_Logging_Handler.h @@ -19,7 +19,6 @@ #include "Log_Message_Receiver.h" #include "Server_Logging_Handler_T.h" -#include "ace/OS.h" #include "ace/svc_export.h" // Typedefs for Logging Handlers & acceptors using a static type based diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp index 63b65612024..f72fefb2589 100644 --- a/netsvcs/lib/Server_Logging_Handler_T.cpp +++ b/netsvcs/lib/Server_Logging_Handler_T.cpp @@ -5,7 +5,7 @@ #define ACE_BUILD_SVC_DLL -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp index a16f4cc688c..6b64b5c2916 100644 --- a/netsvcs/lib/TS_Clerk_Handler.cpp +++ b/netsvcs/lib/TS_Clerk_Handler.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "TS_Clerk_Handler.h" +#include "ace/OS_NS_time.h" ACE_RCSID(lib, TS_Clerk_Handler, "$Id$") diff --git a/netsvcs/lib/TS_Server_Handler.cpp b/netsvcs/lib/TS_Server_Handler.cpp index 3b50a1c0255..0e4223ec088 100644 --- a/netsvcs/lib/TS_Server_Handler.cpp +++ b/netsvcs/lib/TS_Server_Handler.cpp @@ -6,6 +6,7 @@ #include "ace/Containers.h" #include "ace/Get_Opt.h" #include "TS_Server_Handler.h" +#include "ace/OS_NS_time.h" ACE_RCSID(lib, TS_Server_Handler, "$Id$") diff --git a/performance-tests/Misc/basic_perf.cpp b/performance-tests/Misc/basic_perf.cpp index 6156ff6ce30..a6dce2c6fb1 100644 --- a/performance-tests/Misc/basic_perf.cpp +++ b/performance-tests/Misc/basic_perf.cpp @@ -22,8 +22,9 @@ #include "basic_func.h" #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_sys_utsname.h" ACE_RCSID(Misc, basic_perf, "$Id$") diff --git a/performance-tests/Misc/childbirth_time.cpp b/performance-tests/Misc/childbirth_time.cpp index e3b76ef23a3..64f5b79a595 100644 --- a/performance-tests/Misc/childbirth_time.cpp +++ b/performance-tests/Misc/childbirth_time.cpp @@ -62,7 +62,7 @@ // Process Creation profiling -#include "ace/OS.h" +#include "ace/OS_main.h" #include "ace/Get_Opt.h" #include "ace/Process.h" #include "ace/Profile_Timer.h" diff --git a/performance-tests/Misc/context_switch_time.cpp b/performance-tests/Misc/context_switch_time.cpp index 863dc551e20..657d354bd69 100644 --- a/performance-tests/Misc/context_switch_time.cpp +++ b/performance-tests/Misc/context_switch_time.cpp @@ -49,12 +49,16 @@ static const char usage [] = "[-? |\n" " [-n to spawn a new LWP with each thread\n" "[<iterations>]]"; +#include "ace/OS_main.h" #include "ace/Task.h" #include "ace/Sched_Params.h" #include "ace/Stats.h" #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" -#include "ace/Synch.h" +#include "ace/Thread_Semaphore.h" +#include "ace/Barrier.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_errno.h" ACE_RCSID(Misc, context_switch_time, "$Id$") diff --git a/performance-tests/Misc/preempt.cpp b/performance-tests/Misc/preempt.cpp index 210a2cf40cf..b544c7120fa 100644 --- a/performance-tests/Misc/preempt.cpp +++ b/performance-tests/Misc/preempt.cpp @@ -31,10 +31,14 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/ACE.h" #include "ace/Task.h" #include "ace/Sched_Params.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_sys_select.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_errno.h" ACE_RCSID(Misc, preempt, "$Id$") diff --git a/performance-tests/Misc/test_mutex.cpp b/performance-tests/Misc/test_mutex.cpp index 6c510dfc164..0c7ccf33f0d 100644 --- a/performance-tests/Misc/test_mutex.cpp +++ b/performance-tests/Misc/test_mutex.cpp @@ -49,7 +49,8 @@ #include "ace/Log_Msg.h" #include "ace/Profile_Timer.h" -#include "ace/OS.h" +#include "ace/OS_main.h" +#include "ace/OS_NS_Thread.h" ACE_RCSID(Misc, test_mutex, "$Id$") diff --git a/performance-tests/Misc/test_naming.cpp b/performance-tests/Misc/test_naming.cpp index f8af5fc827d..a725aca99bd 100644 --- a/performance-tests/Misc/test_naming.cpp +++ b/performance-tests/Misc/test_naming.cpp @@ -17,10 +17,12 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/SString.h" #include "ace/Naming_Context.h" #include "ace/Profile_Timer.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(Misc, test_naming, "$Id$") diff --git a/performance-tests/Misc/test_singleton.cpp b/performance-tests/Misc/test_singleton.cpp index f46b9cf6e44..6045a104b4b 100644 --- a/performance-tests/Misc/test_singleton.cpp +++ b/performance-tests/Misc/test_singleton.cpp @@ -27,9 +27,10 @@ // for the lock. If there were multiple threads contending for the lock, // the Mutex_Singleton performance would get increasing worse... +#include "ace/OS_main.h" #include "ace/Profile_Timer.h" #include "ace/Singleton.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" #include "ace/Log_Msg.h" #include "test_singleton.h" diff --git a/performance-tests/SCTP/Options_Manager.cpp b/performance-tests/SCTP/Options_Manager.cpp index 198c063e2e9..5efda2650f4 100644 --- a/performance-tests/SCTP/Options_Manager.cpp +++ b/performance-tests/SCTP/Options_Manager.cpp @@ -8,7 +8,7 @@ extern "C" { #include "ace/Get_Opt.h" #include "ace/os_include/netinet/os_in.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" // make sure that the code compiles cleanly even if SCTP is not // available. If SCTP is not installed, program will exit early in @@ -25,6 +25,8 @@ extern "C" { #include "Options_Manager.h" #include "ace/streams.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_arpa_inet.h" // Set default values ACE_CDR::ULong Options_Manager::test_iterations=1000000; @@ -120,10 +122,10 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c break; } case 'm': - histogram_min_bin = ACE_OS_String::strtod(get_opt->opt_arg (), 0); + histogram_min_bin = ACE_OS::strtod(get_opt->opt_arg (), 0); break; case 'M': - histogram_max_bin = ACE_OS_String::strtod(get_opt->opt_arg (), 0); + histogram_max_bin = ACE_OS::strtod(get_opt->opt_arg (), 0); break; case 'x': histogram_num_outliers = ACE_OS::atoi(get_opt->opt_arg ()); @@ -247,7 +249,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c break; } case 'p': - server_port = ACE_OS::atoi(get_opt->opt_arg ()); + server_port = ACE_OS::atoi(get_opt->opt_arg ()); break; case 'a':{ diff --git a/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp b/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp index 09b426cc5f4..f47421060f4 100644 --- a/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp +++ b/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp @@ -23,11 +23,10 @@ // // ============================================================================ -#include /**/ "ace/OS.h" -#include /**/ "ace/SOCK_SEQPACK_Association.h" -#include /**/ "ace/SOCK_SEQPACK_Connector.h" -#include /**/ "ace/INET_Addr.h" -#include /**/ "ace/Log_Msg.h" +#include "ace/SOCK_SEQPACK_Association.h" +#include "ace/SOCK_SEQPACK_Connector.h" +#include "ace/INET_Addr.h" +#include "ace/Log_Msg.h" void dump_names(const ACE_SOCK_SEQPACK_Association& assoc); diff --git a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp index 85fed378f30..89e704853b9 100644 --- a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp +++ b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp @@ -7,6 +7,7 @@ #include "ace/CDR_Stream.h" #include "ace/High_Res_Timer.h" #include "ace/streams.h" +#include "ace/os_include/arpa/os_inet.h" // make sure that the code compiles cleanly even if SCTP is not // available. If SCTP is not installed, program will exit early in diff --git a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp index cf1b679114a..2fd1daa1661 100644 --- a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp +++ b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp @@ -8,6 +8,8 @@ #include "ace/Handle_Set.h" #include "ace/CDR_Stream.h" #include "ace/streams.h" +#include "ace/os_include/arpa/os_inet.h" +#include "ace/OS_NS_sys_select.h" // make sure that the code compiles cleanly even if SCTP is not // available. If SCTP is not installed, program will exit early in diff --git a/performance-tests/SCTP/SOCK_STREAM_clt.cpp b/performance-tests/SCTP/SOCK_STREAM_clt.cpp index 4a7dd39bf86..4d525c864f5 100644 --- a/performance-tests/SCTP/SOCK_STREAM_clt.cpp +++ b/performance-tests/SCTP/SOCK_STREAM_clt.cpp @@ -7,6 +7,8 @@ #include "ace/CDR_Stream.h" #include "ace/High_Res_Timer.h" #include "ace/streams.h" +#include "ace/os_include/netinet/os_tcp.h" +#include "ace/os_include/arpa/os_inet.h" // make sure that the code compiles cleanly even if SCTP is not // available. If SCTP is not installed, program will exit early in diff --git a/performance-tests/SCTP/SOCK_STREAM_srv.cpp b/performance-tests/SCTP/SOCK_STREAM_srv.cpp index 94d3d8b5dde..71a4896e569 100644 --- a/performance-tests/SCTP/SOCK_STREAM_srv.cpp +++ b/performance-tests/SCTP/SOCK_STREAM_srv.cpp @@ -8,6 +8,9 @@ #include "ace/Handle_Set.h" #include "ace/CDR_Stream.h" #include "ace/streams.h" +#include "ace/os_include/netinet/os_tcp.h" +#include "ace/os_include/arpa/os_inet.h" +#include "ace/OS_NS_sys_select.h" // make sure that the code compiles cleanly even if SCTP is not // available. If SCTP is not installed, program will exit early in diff --git a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp index 035f5596f49..519ea333af8 100644 --- a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp +++ b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp @@ -7,6 +7,7 @@ #if defined (ACE_HAS_THREADS) // We need the following only if we have threads enabled.. +#include "ace/OS_main.h" #include "ace/ACE.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" diff --git a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp index 6e63e333e83..0c481f25a3c 100644 --- a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp +++ b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/ACE.h" #include "ace/Task.h" #include "ace/Get_Opt.h" diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp index 0bce791a652..2a22d18b385 100644 --- a/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp +++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp @@ -3,6 +3,7 @@ #if defined (ACE_HAS_THREADS) +#include "ace/OS_main.h" #include "ace/ACE.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp index bc08f453245..a7860ddefbc 100644 --- a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp +++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_main.h" #include "ace/ACE.h" #include "ace/Task.h" #include "ace/Get_Opt.h" diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h index cb17c8c822c..a3f5a49cd12 100644 --- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h +++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h @@ -6,7 +6,7 @@ #ifndef _PERFORMANCE_TEST_OPTIONS_H #define _PERFORMANCE_TEST_OPTIONS_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/performance-tests/Synch-Benchmarks/Synch_Lib/export_mac.h b/performance-tests/Synch-Benchmarks/Synch_Lib/export_mac.h index 9ccc20f399d..60cf50aed9d 100644 --- a/performance-tests/Synch-Benchmarks/Synch_Lib/export_mac.h +++ b/performance-tests/Synch-Benchmarks/Synch_Lib/export_mac.h @@ -7,7 +7,7 @@ #if !defined (SYNCHLIB_EXPORT_H) #define SYNCHLIB_EXPORT_H -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (SYNCHLIB_HAS_DLL) #define SYNCHLIB_HAS_DLL 1 diff --git a/performance-tests/TCP/tcp_test.cpp b/performance-tests/TCP/tcp_test.cpp index 3af48a8f0c5..df093045a2f 100644 --- a/performance-tests/TCP/tcp_test.cpp +++ b/performance-tests/TCP/tcp_test.cpp @@ -31,6 +31,9 @@ #include "ace/Sched_Params.h" #include "ace/Stats.h" #include "ace/Sample_History.h" +#include "ace/OS_main.h" +#include "ace/OS_NS_arpa_inet.h" +#include "ace/OS_NS_errno.h" // FUZZ: disable check_for_math_include #include <math.h> diff --git a/performance-tests/UDP/udp_test.cpp b/performance-tests/UDP/udp_test.cpp index 2b0d8361da9..2da41b2b725 100644 --- a/performance-tests/UDP/udp_test.cpp +++ b/performance-tests/UDP/udp_test.cpp @@ -16,6 +16,7 @@ // // ============================================================================ +#include "ace/OS_main.h" #include "ace/Reactor.h" #include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" @@ -23,6 +24,9 @@ #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_arpa_inet.h" +#include "ace/OS_NS_string.h" // FUZZ: disable check_for_math_include #include <math.h> diff --git a/protocols/ace/RMCast/RMCast.h b/protocols/ace/RMCast/RMCast.h index 2259af24fbb..9d9d7650e54 100644 --- a/protocols/ace/RMCast/RMCast.h +++ b/protocols/ace/RMCast/RMCast.h @@ -18,13 +18,14 @@ #define ACE_RMCAST_H #include /**/ "ace/pre.h" -#include "ace/OS.h" #include "RMCast_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Basic_Types.h" + class ACE_Message_Block; class ACE_RMCast_Proxy; diff --git a/protocols/ace/RMCast/RMCast_Copy_On_Write.h b/protocols/ace/RMCast/RMCast_Copy_On_Write.h index 4421ca92b83..c73dade591b 100644 --- a/protocols/ace/RMCast/RMCast_Copy_On_Write.h +++ b/protocols/ace/RMCast/RMCast_Copy_On_Write.h @@ -6,7 +6,9 @@ #include /**/ "ace/pre.h" #include "RMCast_Worker.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Basic_Types.h" +#include "ace/Condition_Thread_Mutex.h" //! A wrapper to implement reference counted collections template<class COLLECTION, class ITERATOR> diff --git a/protocols/ace/RMCast/RMCast_Copy_On_Write.i b/protocols/ace/RMCast/RMCast_Copy_On_Write.i index 3c069c84eb6..c83483c0729 100644 --- a/protocols/ace/RMCast/RMCast_Copy_On_Write.i +++ b/protocols/ace/RMCast/RMCast_Copy_On_Write.i @@ -1,5 +1,9 @@ +// -*- C++ -*- // $Id$ +#include "ace/Guard_T.h" +#include "ace/Null_Mutex.h" + template<class COLLECTION, class ITERATOR> ACE_INLINE ACE_RMCast_Copy_On_Write_Collection<COLLECTION,ITERATOR>:: ACE_RMCast_Copy_On_Write_Collection (void) diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.cpp b/protocols/ace/RMCast/RMCast_IO_UDP.cpp index cfed8a53d98..13801b47bd5 100644 --- a/protocols/ace/RMCast/RMCast_IO_UDP.cpp +++ b/protocols/ace/RMCast/RMCast_IO_UDP.cpp @@ -1,16 +1,21 @@ // $Id$ #include "RMCast_IO_UDP.h" + +#if !defined (__ACE_INLINE__) +# include "RMCast_IO_UDP.i" +#endif /* ! __ACE_INLINE__ */ + #include "RMCast_UDP_Proxy.h" #include "RMCast_Module_Factory.h" #include "ace/Handle_Set.h" #include "ace/Reactor.h" #include "ace/Message_Block.h" - -#if !defined (__ACE_INLINE__) -# include "RMCast_IO_UDP.i" -#endif /* ! __ACE_INLINE__ */ +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_select.h" +#include "ace/os_include/arpa/os_inet.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(ace, RMCast_IO_UDP, "RMCast_IO_UDP.cpp,v 1.12 2000/12/20 22:00:33 oci Exp") diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.h b/protocols/ace/RMCast/RMCast_IO_UDP.h index 4881233cb59..9e1a83dc032 100644 --- a/protocols/ace/RMCast/RMCast_IO_UDP.h +++ b/protocols/ace/RMCast/RMCast_IO_UDP.h @@ -19,6 +19,7 @@ #include "ace/Hash_Map_Manager.h" #include "ace/Synch.h" #include "ace/INET_Addr.h" +#include "ace/Null_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/protocols/ace/RMCast/RMCast_Membership.cpp b/protocols/ace/RMCast/RMCast_Membership.cpp index 91c9b1a9cea..598e05019af 100644 --- a/protocols/ace/RMCast/RMCast_Membership.cpp +++ b/protocols/ace/RMCast/RMCast_Membership.cpp @@ -3,12 +3,14 @@ // #include "RMCast_Membership.h" -#include "RMCast_Proxy.h" #if !defined (__ACE_INLINE__) # include "RMCast_Membership.i" #endif /* ! __ACE_INLINE__ */ +#include "RMCast_Proxy.h" +#include "ace/Guard_T.h" + ACE_RCSID(ace, RMCast_Membership, "$Id$") ACE_RMCast_Membership::~ACE_RMCast_Membership (void) diff --git a/protocols/ace/RMCast/RMCast_Membership.h b/protocols/ace/RMCast/RMCast_Membership.h index beab2c881f9..14d5790e584 100644 --- a/protocols/ace/RMCast/RMCast_Membership.h +++ b/protocols/ace/RMCast/RMCast_Membership.h @@ -20,7 +20,8 @@ #include "RMCast_Module.h" #include "ace/Containers.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/protocols/ace/RMCast/RMCast_Reassembly.h b/protocols/ace/RMCast/RMCast_Reassembly.h index bc3fc17049d..d4ed999cf78 100644 --- a/protocols/ace/RMCast/RMCast_Reassembly.h +++ b/protocols/ace/RMCast/RMCast_Reassembly.h @@ -16,7 +16,9 @@ #include "RMCast_Module.h" #include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Null_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/protocols/ace/RMCast/RMCast_Reordering.h b/protocols/ace/RMCast/RMCast_Reordering.h index 4ecf824acac..dadca2aa0f6 100644 --- a/protocols/ace/RMCast/RMCast_Reordering.h +++ b/protocols/ace/RMCast/RMCast_Reordering.h @@ -17,7 +17,9 @@ #include "RMCast_Module.h" #include "ace/RB_Tree.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Null_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/protocols/ace/RMCast/RMCast_Sequencer.cpp b/protocols/ace/RMCast/RMCast_Sequencer.cpp index f8bc0e6c57d..356fbb4a01b 100644 --- a/protocols/ace/RMCast/RMCast_Sequencer.cpp +++ b/protocols/ace/RMCast/RMCast_Sequencer.cpp @@ -8,6 +8,8 @@ # include "RMCast_Sequencer.i" #endif /* ! __ACE_INLINE__ */ +#include "ace/Guard_T.h" + ACE_RCSID(ace, RMCast_Sequencer, "$Id$") ACE_RMCast_Sequencer::~ACE_RMCast_Sequencer (void) diff --git a/protocols/ace/RMCast/RMCast_Sequencer.h b/protocols/ace/RMCast/RMCast_Sequencer.h index 8e6447dce62..28f83a1d4b3 100644 --- a/protocols/ace/RMCast/RMCast_Sequencer.h +++ b/protocols/ace/RMCast/RMCast_Sequencer.h @@ -16,7 +16,8 @@ #include /**/ "ace/pre.h" #include "RMCast_Module.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp b/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp index c84b8c0f2ef..fb7eaf72f76 100644 --- a/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp +++ b/protocols/ace/RMCast/RMCast_UDP_Proxy.cpp @@ -1,14 +1,17 @@ // $Id$ #include "RMCast_UDP_Proxy.h" -#include "RMCast_Module.h" -#include "RMCast_IO_UDP.h" -#include "ace/Message_Block.h" #if !defined (__ACE_INLINE__) # include "RMCast_UDP_Proxy.i" #endif /* ! __ACE_INLINE__ */ +#include "RMCast_Module.h" +#include "RMCast_IO_UDP.h" +#include "ace/Message_Block.h" +#include "ace/OS_NS_string.h" +#include "ace/os_include/arpa/os_inet.h" + ACE_RCSID(ace, RMCast_UDP_Proxy, "$Id$") ACE_RMCast_UDP_Proxy::ACE_RMCast_UDP_Proxy (ACE_RMCast_IO_UDP *io_udp, diff --git a/tests/Aio_Platform_Test.cpp b/tests/Aio_Platform_Test.cpp index e2ec2209aa1..9d22b6da78d 100644 --- a/tests/Aio_Platform_Test.cpp +++ b/tests/Aio_Platform_Test.cpp @@ -19,7 +19,7 @@ // ===================================================================== #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Aio_Platform_Test, "$Id$") diff --git a/tests/Auto_IncDec_Test.cpp b/tests/Auto_IncDec_Test.cpp index 31516eed34d..6b4330e83ba 100644 --- a/tests/Auto_IncDec_Test.cpp +++ b/tests/Auto_IncDec_Test.cpp @@ -21,7 +21,7 @@ #include "ace/Thread_Manager.h" #include "ace/Atomic_Op.h" #include "tests/test_config.h" - +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Auto_IncDec_Test, "Auto_IncDec_Test.cpp, by Edan Ayal") diff --git a/tests/Barrier_Test.cpp b/tests/Barrier_Test.cpp index c7db6350014..ce2fa29cb5b 100644 --- a/tests/Barrier_Test.cpp +++ b/tests/Barrier_Test.cpp @@ -18,7 +18,7 @@ // ============================================================================ #include "test_config.h" -#include "ace/Synch.h" +#include "ace/Barrier.h" #include "ace/Thread_Manager.h" ACE_RCSID(tests, Barrier_Test, "$Id$") diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp index 95e1cd848cf..cd7c58f6174 100644 --- a/tests/Basic_Types_Test.cpp +++ b/tests/Basic_Types_Test.cpp @@ -36,7 +36,7 @@ #endif /* ! ACE_HAS_MINIMAL_ACE_OS */ #include "ace/Basic_Types.h" -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Basic_Types_Test, "$Id$") diff --git a/tests/Buffer_Stream_Test.cpp b/tests/Buffer_Stream_Test.cpp index 9a8575ff6b1..7c903162435 100644 --- a/tests/Buffer_Stream_Test.cpp +++ b/tests/Buffer_Stream_Test.cpp @@ -26,6 +26,7 @@ #include "ace/Stream.h" #include "ace/Module.h" #include "ace/Task.h" +#include "ace/OS_NS_time.h" ACE_RCSID(tests, Buffer_Stream_Test, "$Id$") diff --git a/tests/CE_fostream.h b/tests/CE_fostream.h index 347cfc0e71d..b488aaba3b1 100644 --- a/tests/CE_fostream.h +++ b/tests/CE_fostream.h @@ -23,8 +23,7 @@ #ifdef ACE_HAS_WINCE -#include "ace/OS.h" - +#include "ace/Null_Mutex.h" #include "ace/Singleton.h" #ifdef ostream diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp index 871ca9319b9..524c64e63f2 100644 --- a/tests/Cache_Map_Manager_Test.cpp +++ b/tests/Cache_Map_Manager_Test.cpp @@ -19,12 +19,13 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS_NS_time.h" #include "test_config.h" #include "ace/Hash_Cache_Map_Manager_T.h" #include "ace/Map_Manager.h" diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp index 29d0aa2dd25..a1f0b549f44 100644 --- a/tests/Config_Test.cpp +++ b/tests/Config_Test.cpp @@ -22,6 +22,8 @@ #include "test_config.h" #include "Config_Test.h" #include "ace/Configuration_Import_Export.h" +#include "ace/OS_NS_errno.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(tests, Config_Test, "$Id$") diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp index 04466e250bd..63fd23b4c7a 100644 --- a/tests/Conn_Test.cpp +++ b/tests/Conn_Test.cpp @@ -33,6 +33,9 @@ #include "ace/Get_Opt.h" #include "ace/Process_Mutex.h" #include "Conn_Test.h" +#include "ace/Barrier.h" +#include "ace/OS_NS_signal.h" +#include "ace/OS_NS_sys_wait.h" ACE_RCSID(tests, Conn_Test, "$Id$") diff --git a/tests/DLL_Test.cpp b/tests/DLL_Test.cpp index 077de0581e8..adea3f2903a 100644 --- a/tests/DLL_Test.cpp +++ b/tests/DLL_Test.cpp @@ -117,7 +117,7 @@ int basic_test (ACE_DLL &dll) // Allocate and free a string allocated via malloc in a different dll. ACE_TCHAR *malloc_str = my_hello->malloc_info (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Result for malloc_info(): %s\n"), malloc_str)); - ACE_OS_Memory::free (malloc_str); + ACE_OS::free (malloc_str); return 0; } diff --git a/tests/DLL_Test_Impl.cpp b/tests/DLL_Test_Impl.cpp index 7663009ceec..e1171b1c5e2 100644 --- a/tests/DLL_Test_Impl.cpp +++ b/tests/DLL_Test_Impl.cpp @@ -20,6 +20,7 @@ #include "ace/ACE.h" #include "ace/OS_Errno.h" #include "ace/svc_export.h" +#include "ace/OS_NS_string.h" ACE_RCSID (tests, DLL_Test_Impl, @@ -51,7 +52,7 @@ Hello_Impl::new_info (void) ACE_TCHAR * Hello_Impl::malloc_info (void) { - return ACE_OS_String::strdup (ACE_TEXT ("Hello_Impl::new_info() allocated by ACE_OS_Memory::malloc()")); + return ACE_OS::strdup (ACE_TEXT ("Hello_Impl::new_info() allocated by ACE_OS::malloc()")); } void * diff --git a/tests/DLL_Test_Impl.h b/tests/DLL_Test_Impl.h index 5ae706edf2b..bf16bdd5c48 100644 --- a/tests/DLL_Test_Impl.h +++ b/tests/DLL_Test_Impl.h @@ -46,7 +46,7 @@ public: // Uses ACE::strnew() to allocate the returned string. ACE_TCHAR *malloc_info (void); - // Uses ACE_OS_Memory::malloc() to allocate the returned string. + // Uses ACE_OS::malloc() to allocate the returned string. // Overload the new/delete opertors so the object will be // created/deleted using the memory allocator associated with the diff --git a/tests/Dirent_Test.cpp b/tests/Dirent_Test.cpp index 0ddec323d80..e392d022c7a 100644 --- a/tests/Dirent_Test.cpp +++ b/tests/Dirent_Test.cpp @@ -24,8 +24,7 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" #include "ace/Dirent.h" #include "ace/Dirent_Selector.h" @@ -47,13 +46,13 @@ static int entrycount = 0; static int selector (const dirent *d) { - return ACE_OS_String::strcmp (d->d_name, ACE_TEXT (TEST_ENTRY)) == 0; + return ACE_OS::strcmp (d->d_name, ACE_TEXT (TEST_ENTRY)) == 0; } static int comparator (const dirent **d1, const dirent **d2) { - return ACE_OS_String::strcmp ((*d1)->d_name, (*d2)->d_name); + return ACE_OS::strcmp ((*d1)->d_name, (*d2)->d_name); } static int diff --git a/tests/Enum_Interfaces_Test.cpp b/tests/Enum_Interfaces_Test.cpp index f9855977db6..71f409dfae9 100644 --- a/tests/Enum_Interfaces_Test.cpp +++ b/tests/Enum_Interfaces_Test.cpp @@ -29,7 +29,7 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_sys_utsname.h" #include "ace/INET_Addr.h" ACE_RCSID(tests, Enum_Interfaces_Test, "$Id$") diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp index 8971ffd39a6..bb2ece06627 100644 --- a/tests/Env_Value_Test.cpp +++ b/tests/Env_Value_Test.cpp @@ -15,7 +15,6 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" #include "ace/Process.h" #include "ace/Env_Value_T.h" diff --git a/tests/FIFO_Test.cpp b/tests/FIFO_Test.cpp index 6d82391a83a..7778d52a9db 100644 --- a/tests/FIFO_Test.cpp +++ b/tests/FIFO_Test.cpp @@ -20,7 +20,9 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_stat.h" +#include "ace/OS_NS_sys_wait.h" #include "ace/ACE.h" #include "ace/FIFO_Send_Msg.h" #include "ace/FIFO_Recv_Msg.h" @@ -187,7 +189,7 @@ test_fifo_msg (void) if (ACE_Lib_Find::get_temp_dir (fifo_path, MAXPATHLEN) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("get_temp_dir")), 1); - ACE_OS_String::strcat (fifo_path, ACE_TEXT ("FIFO_Test")); + ACE_OS::strcat (fifo_path, ACE_TEXT ("FIFO_Test")); ACE_FIFO_Recv_Msg read_side; // Open read only, not persistent (4th arg is 0) if (-1 == read_side.open (fifo_path, diff --git a/tests/Framework_Component_DLL.cpp b/tests/Framework_Component_DLL.cpp index e5a1bdb4bca..894d1af9f4f 100644 --- a/tests/Framework_Component_DLL.cpp +++ b/tests/Framework_Component_DLL.cpp @@ -3,7 +3,6 @@ #include "ace/Service_Config.h" #include "ace/Service_Object.h" #include "ace/Framework_Component_T.h" -#include "ace/OS.h" ACE_RCSID (tests, Framework_Component_DLL, diff --git a/tests/Hash_Map_Bucket_Iterator_Test.cpp b/tests/Hash_Map_Bucket_Iterator_Test.cpp index cae31d8c504..affd0ba8698 100644 --- a/tests/Hash_Map_Bucket_Iterator_Test.cpp +++ b/tests/Hash_Map_Bucket_Iterator_Test.cpp @@ -18,7 +18,8 @@ #include "test_config.h" #include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Null_Mutex.h" #include "ace/Get_Opt.h" #include "ace/Functor.h" diff --git a/tests/Hash_Map_Manager_Test.cpp b/tests/Hash_Map_Manager_Test.cpp index c87f7c5f9b0..26a41c0cd98 100644 --- a/tests/Hash_Map_Manager_Test.cpp +++ b/tests/Hash_Map_Manager_Test.cpp @@ -23,7 +23,7 @@ #include "test_config.h" #include "ace/Hash_Map_Manager.h" #include "ace/Malloc_T.h" -#include "ace/Synch.h" +#include "ace/Null_Mutex.h" ACE_RCSID(tests, Hash_Map_Manager_Test, "$Id$") diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp index b2e99072314..7a990302fd8 100644 --- a/tests/High_Res_Timer_Test.cpp +++ b/tests/High_Res_Timer_Test.cpp @@ -20,6 +20,7 @@ #include "ace/High_Res_Timer.h" #include "ace/Sched_Params.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, High_Res_Timer_Test, "High_Res_Timer_Test.cpp,v 4.6 2000/04/23 04:43:58 brunsch Exp") diff --git a/tests/INET_Addr_Test.cpp b/tests/INET_Addr_Test.cpp index f48f99f51fa..c738ff94d1d 100644 --- a/tests/INET_Addr_Test.cpp +++ b/tests/INET_Addr_Test.cpp @@ -19,9 +19,10 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #include "ace/INET_Addr.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_arpa_inet.h" // Make sure that ACE_Addr::addr_type_ is the same // as the family of the inet_addr_. diff --git a/tests/Logging_Strategy_Test.cpp b/tests/Logging_Strategy_Test.cpp index 32ab9aace06..f393d3033d1 100644 --- a/tests/Logging_Strategy_Test.cpp +++ b/tests/Logging_Strategy_Test.cpp @@ -32,7 +32,7 @@ // //========================================================================== -#include "ace/OS.h" +#include "ace/OS_NS_sys_stat.h" #include "ace/Auto_Ptr.h" #include "ace/Service_Config.h" #include "ace/Thread_Manager.h" @@ -46,6 +46,7 @@ #include "ace/Auto_Ptr.cpp" #include "ace/Get_Opt.h" #include "test_config.h" +#include "ace/OS_NS_time.h" ACE_RCSID(tests, Logging_Strategy_Test, "$Id$") @@ -463,11 +464,11 @@ int run_main (int argc, ACE_TCHAR *argv []) for (int i = 1; i < argc; i++) { - ACE_OS_String::strcat (arg_str, argv[i]); - ACE_OS_String::strcat (arg_str, ACE_TEXT (" ")); + ACE_OS::strcat (arg_str, argv[i]); + ACE_OS::strcat (arg_str, ACE_TEXT (" ")); } - ACE_OS_String::strcat (arg_str, ACE_TEXT ("\"")); + ACE_OS::strcat (arg_str, ACE_TEXT ("\"")); if (ACE_Service_Config::process_directive (arg_str) == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp index 77089073451..2c5ee3b24b3 100644 --- a/tests/MEM_Stream_Test.cpp +++ b/tests/MEM_Stream_Test.cpp @@ -18,7 +18,6 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" #include "ace/Thread_Manager.h" #include "ace/MEM_Connector.h" @@ -123,7 +122,7 @@ Echo_Handler::handle_input (ACE_HANDLE) ACE_TCHAR return_buf[MAXPATHLEN]; ACE_OS::strcpy (return_buf, this->name_); - ACE_OS_String::strcat (return_buf, buf); + ACE_OS::strcat (return_buf, buf); len = (ACE_OS::strlen (return_buf) + 1) * sizeof (ACE_TCHAR); if (this->peer ().send (return_buf, len) != len) diff --git a/tests/MEM_Stream_Test.h b/tests/MEM_Stream_Test.h index 663bfcb8ac6..b9ed6924463 100644 --- a/tests/MEM_Stream_Test.h +++ b/tests/MEM_Stream_Test.h @@ -26,11 +26,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" #include "ace/MEM_Stream.h" #include "ace/Reactor.h" #include "ace/Svc_Handler.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) diff --git a/tests/MM_Shared_Memory_Test.cpp b/tests/MM_Shared_Memory_Test.cpp index 46f2be7d000..a69a33a0606 100644 --- a/tests/MM_Shared_Memory_Test.cpp +++ b/tests/MM_Shared_Memory_Test.cpp @@ -23,11 +23,11 @@ #include "test_config.h" #include "ace/Shared_Memory_MM.h" -#include "ace/Synch.h" #include "ace/SV_Semaphore_Simple.h" #include "ace/Process_Semaphore.h" #include "ace/Thread_Manager.h" #include "ace/ACE.h" +#include "ace/OS_NS_string.h" ACE_RCSID(tests, MM_Shared_Memory_Test, "$Id$") @@ -202,7 +202,7 @@ run_main (int, ACE_TCHAR *[]) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Temporary path too long\n")), -1); // Add the filename to the end - ACE_OS_String::strcat (temp_file, ACE_TEXT ("mm_shared_mem_testXXXXXX")); + ACE_OS::strcat (temp_file, ACE_TEXT ("mm_shared_mem_testXXXXXX")); // Store in the global variable. shm_key = temp_file; diff --git a/tests/MT_Reactor_Upcall_Test.cpp b/tests/MT_Reactor_Upcall_Test.cpp index 71ec9cc5f2b..5c9e5992c9f 100644 --- a/tests/MT_Reactor_Upcall_Test.cpp +++ b/tests/MT_Reactor_Upcall_Test.cpp @@ -208,8 +208,8 @@ test_reactor_upcall (ACE_Reactor &reactor) data_message.type_ = Message::DATA; data_message.size_ = - ACE_OS_String::strlen (message); - ACE_OS_String::strcpy (data_message.data_, message); + ACE_OS::strlen (message); + ACE_OS::strcpy (data_message.data_, message); // Send in three pieces because the struct members may not be adjacent // in memory. diff --git a/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/tests/MT_Reference_Counted_Event_Handler_Test.cpp index d7f9f73e3fb..e994b4344a1 100644 --- a/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -36,6 +36,8 @@ #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" #include "ace/Auto_Event.h" +#include "ace/OS_NS_signal.h" +#include "ace/OS_NS_time.h" ACE_RCSID(tests, MT_Reference_Counted_Event_Handler_Test, "$Id$") diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp index 35377099030..a82d7a19aaa 100644 --- a/tests/MT_SOCK_Test.cpp +++ b/tests/MT_SOCK_Test.cpp @@ -24,7 +24,8 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_sys_select.h" +#include "ace/OS_NS_sys_wait.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" #include "ace/SOCK_Connector.h" diff --git a/tests/Main.cpp b/tests/Main.cpp index e80f79ca2c2..44b92128394 100644 --- a/tests/Main.cpp +++ b/tests/Main.cpp @@ -17,7 +17,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_HAS_WINCE) # include "ace/ACE.h" #endif /* ACE_HAS_WINCE */ diff --git a/tests/Map_Test.cpp b/tests/Map_Test.cpp index 4d9d7bba1ac..9a8a634662f 100644 --- a/tests/Map_Test.cpp +++ b/tests/Map_Test.cpp @@ -21,7 +21,6 @@ #include "Map_Test.h" #include "ace/Map_T.h" #include "ace/Profile_Timer.h" -#include "ace/Synch.h" ACE_RCSID(tests, Map_Test, "$Id$") diff --git a/tests/Map_Test.h b/tests/Map_Test.h index 946b03f33f1..c881a3f7645 100644 --- a/tests/Map_Test.h +++ b/tests/Map_Test.h @@ -22,11 +22,12 @@ #ifndef ACE_TESTS_MAP_TEST_H #define ACE_TESTS_MAP_TEST_H +#include "ace/OS_NS_string.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" #include "ace/Active_Map_Manager.h" #include "ace/Containers.h" diff --git a/tests/Max_Default_Port_Test.cpp b/tests/Max_Default_Port_Test.cpp index 242edbb3e8a..39ab791ccc8 100644 --- a/tests/Max_Default_Port_Test.cpp +++ b/tests/Max_Default_Port_Test.cpp @@ -26,7 +26,6 @@ // // ============================================================================ -#include "ace/OS.h" #include "ace/streams.h" #include "ace/Reactor.h" #include "ace/SOCK_Connector.h" diff --git a/tests/Mem_Map_Test.cpp b/tests/Mem_Map_Test.cpp index 199efe6e824..87a7953ee31 100644 --- a/tests/Mem_Map_Test.cpp +++ b/tests/Mem_Map_Test.cpp @@ -22,6 +22,7 @@ #include "test_config.h" #include "ace/Mem_Map.h" #include "ace/ACE.h" +#include "ace/OS_NS_string.h" ACE_RCSID(tests, Mem_Map_Test, "$Id$") @@ -144,12 +145,12 @@ run_main (int, ACE_TCHAR *[]) ACE_OS::strcpy (temp_file2, test_file); // Add the filenames to the end - ACE_OS_String::strcat (test_file, - ACE_TEXT ("ace_mem_map_test")); - ACE_OS_String::strcat (temp_file1, - ACE_TEXT ("ace_mem_map_temp_1")); - ACE_OS_String::strcat (temp_file2, - ACE_TEXT ("ace_mem_map_temp_2")); + ACE_OS::strcat (test_file, + ACE_TEXT ("ace_mem_map_test")); + ACE_OS::strcat (temp_file1, + ACE_TEXT ("ace_mem_map_temp_1")); + ACE_OS::strcat (temp_file2, + ACE_TEXT ("ace_mem_map_temp_2")); // First create a test file to work on if (create_test_file (test_file, LINE_LENGTH, NUM_LINES) != 0) diff --git a/tests/Message_Queue_Notifications_Test.cpp b/tests/Message_Queue_Notifications_Test.cpp index 567df50cf00..96b707a9e04 100644 --- a/tests/Message_Queue_Notifications_Test.cpp +++ b/tests/Message_Queue_Notifications_Test.cpp @@ -40,6 +40,7 @@ #include "ace/Reactor_Notification_Strategy.h" #include "ace/Atomic_Op.h" #include "ace/Barrier.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Message_Queue_Notifications_Test, "$Id$") diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp index a60d99253e4..6f4c9a07166 100644 --- a/tests/Message_Queue_Test.cpp +++ b/tests/Message_Queue_Test.cpp @@ -25,8 +25,11 @@ #include "test_config.h" #include "ace/Thread_Manager.h" #include "ace/Message_Queue.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Null_Mutex.h" +#include "ace/Null_Condition.h" #include "ace/High_Res_Timer.h" +#include "ace/OS_NS_string.h" ACE_RCSID(tests, Message_Queue_Test, "$Id$") diff --git a/tests/Message_Queue_Test_Ex.cpp b/tests/Message_Queue_Test_Ex.cpp index b26ae57b453..b48471699e6 100644 --- a/tests/Message_Queue_Test_Ex.cpp +++ b/tests/Message_Queue_Test_Ex.cpp @@ -26,7 +26,9 @@ #include "test_config.h" #include "ace/Thread_Manager.h" #include "ace/Message_Queue.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Null_Mutex.h" +#include "ace/Null_Condition.h" #include "ace/High_Res_Timer.h" #include "ace/Message_Block.h" #include "Message_Queue_Test_Ex.h" // Declares User_Class diff --git a/tests/Message_Queue_Test_Ex.h b/tests/Message_Queue_Test_Ex.h index fb3533a00d2..70c5e1f9cf8 100644 --- a/tests/Message_Queue_Test_Ex.h +++ b/tests/Message_Queue_Test_Ex.h @@ -18,7 +18,7 @@ #ifndef ACE_TESTS_MESSAGE_QUEUE_TEST_EX_H #define ACE_TESTS_MESSAGE_QUEUE_TEST_EX_H -#include "ace/OS.h" +#include "ace/OS_NS_string.h" // User-defined class used for queue data. class User_Class diff --git a/tests/Multicast_Test.cpp b/tests/Multicast_Test.cpp index 83d28d72200..84b25bd01dd 100644 --- a/tests/Multicast_Test.cpp +++ b/tests/Multicast_Test.cpp @@ -39,7 +39,8 @@ #include "ace/SOCK_Dgram_Mcast.h" #include "ace/ACE.h" #include "ace/Reactor.h" -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_strings.h" #include "ace/Task.h" #include "ace/Atomic_Op.h" #include "ace/SString.h" @@ -738,7 +739,7 @@ int send_dgram (ACE_SOCK_Dgram &socket, ACE_INET_Addr addr, int done = 0) else ACE_OS::sprintf (buf, "%s/%d", address, port); //ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("sending (%s)\n"), buf)); - if (socket.send (buf, ACE_OS_String::strlen (buf),addr) == -1) + if (socket.send (buf, ACE_OS::strlen (buf),addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send_dgram - error calling send on ") ACE_TEXT ("ACE_SOCK_Dgram.")), -1); diff --git a/tests/Multihomed_INET_Addr_Test.cpp b/tests/Multihomed_INET_Addr_Test.cpp index 6d89b769946..0312f9be665 100644 --- a/tests/Multihomed_INET_Addr_Test.cpp +++ b/tests/Multihomed_INET_Addr_Test.cpp @@ -18,10 +18,11 @@ // // ============================================================================ -#include /**/ "test_config.h" -#include /**/ "ace/OS.h" -#include /**/ "ace/Multihomed_INET_Addr.h" -#include /**/ "ace/Log_Msg.h" +#include "test_config.h" +#include "ace/OS_NS_string.h" +#include "ace/Multihomed_INET_Addr.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_arpa_inet.h" int run_main (int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp index 4944a706f1d..1cb459060e4 100644 --- a/tests/Naming_Test.cpp +++ b/tests/Naming_Test.cpp @@ -22,6 +22,7 @@ #include "ace/SString.h" #include "ace/Naming_Context.h" #include "ace/Profile_Timer.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(tests, Naming_Test, "$Id$") @@ -198,7 +199,7 @@ run_main (int argc, ACE_TCHAR *argv[]) { ACE_OS::strcpy (temp_file, ACE::basename (name_options->process_name (), ACE_DIRECTORY_SEPARATOR_CHAR)); - ACE_OS_String::strcat (temp_file, ACE_TEXT ("XXXXXX")); + ACE_OS::strcat (temp_file, ACE_TEXT ("XXXXXX")); // Set the database name using mktemp to generate a unique file name name_options->database (ACE_OS::mktemp (temp_file)); diff --git a/tests/New_Fail_Test.cpp b/tests/New_Fail_Test.cpp index 20fcc8f8ba9..4a25d63933c 100644 --- a/tests/New_Fail_Test.cpp +++ b/tests/New_Fail_Test.cpp @@ -25,7 +25,7 @@ #include "test_config.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" +#include "ace/OS_Memory.h" #include "ace/CORBA_macros.h" ACE_RCSID(tests, New_Fail_Test, "$Id$") diff --git a/tests/OS_Test.cpp b/tests/OS_Test.cpp index e11b78c3278..343c31119ff 100644 --- a/tests/OS_Test.cpp +++ b/tests/OS_Test.cpp @@ -13,7 +13,14 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_strings.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_sys_stat.h" +#include "ace/OS_NS_unistd.h" #include "test_config.h" ACE_RCSID(tests, OS_Test, "$Id$") @@ -141,11 +148,11 @@ string_emulation_test (void) const char *memchr1 = "abcdefghijklmnopqrstuvwxyz"; - ACE_ASSERT (ACE_OS_String::memchr (ACE_static_cast (const void *, NULL), - 'a', - 0) == NULL); - ACE_ASSERT (ACE_OS_String::memchr (memchr1, 'a', sizeof (memchr1)) != NULL); - ACE_ASSERT (ACE_OS_String::memchr (memchr1, '1', sizeof (memchr1)) == NULL); + ACE_ASSERT (ACE_OS::memchr (ACE_static_cast (const void *, NULL), + 'a', + 0) == NULL); + ACE_ASSERT (ACE_OS::memchr (memchr1, 'a', sizeof (memchr1)) != NULL); + ACE_ASSERT (ACE_OS::memchr (memchr1, '1', sizeof (memchr1)) == NULL); // ======================================================================== // Test strchr @@ -153,9 +160,9 @@ string_emulation_test (void) const char *strchr1 = "abcdefghijkabcdefghijk"; - ACE_ASSERT (*ACE_OS_String::strchr (strchr1, 'h') == 'h'); - ACE_ASSERT (ACE_OS_String::strchr (strchr1, 'h') == strchr1 + 7); - ACE_ASSERT (ACE_OS_String::strchr (strchr1, '1') == NULL); + ACE_ASSERT (*ACE_OS::strchr (strchr1, 'h') == 'h'); + ACE_ASSERT (ACE_OS::strchr (strchr1, 'h') == strchr1 + 7); + ACE_ASSERT (ACE_OS::strchr (strchr1, '1') == NULL); // ======================================================================== // Test strrchr @@ -163,9 +170,9 @@ string_emulation_test (void) const char *strrchr1 = "abcdefghijkabcdefghijk"; - ACE_ASSERT (*ACE_OS_String::strrchr (strrchr1, 'h') == 'h'); - ACE_ASSERT (ACE_OS_String::strrchr (strrchr1, 'h') == strrchr1 + 18); - ACE_ASSERT (ACE_OS_String::strrchr (strrchr1, '1') == NULL); + ACE_ASSERT (*ACE_OS::strrchr (strrchr1, 'h') == 'h'); + ACE_ASSERT (ACE_OS::strrchr (strrchr1, 'h') == strrchr1 + 18); + ACE_ASSERT (ACE_OS::strrchr (strrchr1, '1') == NULL); // ======================================================================== // Test strcspn @@ -173,8 +180,8 @@ string_emulation_test (void) const char *strcspn1 = "abcdefghijkabcdefghijk"; - ACE_ASSERT (ACE_OS_String::strcspn (strcspn1, "d") == 3); - ACE_ASSERT (ACE_OS_String::strcspn (strcspn1, "abcdefghijk") == 0); + ACE_ASSERT (ACE_OS::strcspn (strcspn1, "d") == 3); + ACE_ASSERT (ACE_OS::strcspn (strcspn1, "abcdefghijk") == 0); // ======================================================================== // Test strcasecmp @@ -186,11 +193,11 @@ string_emulation_test (void) const char *strcasecmp4 = "STRINGF"; // Different case const char *strcasecmp5 = "stringe"; // The last letter is lower - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp1) == 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp2) < 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp3) < 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp4) == 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp5) > 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp1) == 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp2) < 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp3) < 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp4) == 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp5) > 0); // ======================================================================== // Test strtok_r @@ -199,23 +206,23 @@ string_emulation_test (void) char strtok_r1[] = "A string of tokens"; char *strtok_r2; - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (strtok_r1, - " ", - &strtok_r2), - "A") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (0, - " ", - &strtok_r2), - "string") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (0, - " ", - &strtok_r2), - "of") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (0, - " ", - &strtok_r2), - "tokens") == 0); - ACE_ASSERT (ACE_OS_String::strtok_r (0, " ", &strtok_r2) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok_r (strtok_r1, + " ", + &strtok_r2), + "A") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok_r (0, + " ", + &strtok_r2), + "string") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok_r (0, + " ", + &strtok_r2), + "of") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok_r (0, + " ", + &strtok_r2), + "tokens") == 0); + ACE_ASSERT (ACE_OS::strtok_r (0, " ", &strtok_r2) == 0); // ======================================================================== // Test itoa @@ -223,32 +230,32 @@ string_emulation_test (void) char itoa1[33]; - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itoa1, 2), - "101010") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (42, itoa1, 2), + "101010") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itoa1, 3), - "1120") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (42, itoa1, 3), + "1120") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itoa1, 16), - "2a") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (42, itoa1, 16), + "2a") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (8, itoa1, 10), - "8") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (8, itoa1, 10), + "8") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (-8, itoa1, 10), - "-8") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (-8, itoa1, 10), + "-8") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (20345, itoa1, 10), - "20345") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (20345, itoa1, 10), + "20345") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (-20345, itoa1, 10), - "-20345") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (-20345, itoa1, 10), + "-20345") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (4566733, itoa1, 10), - "4566733") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (4566733, itoa1, 10), + "4566733") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (-4566733, itoa1, 10), - "-4566733") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (-4566733, itoa1, 10), + "-4566733") == 0); } #if defined (ACE_HAS_WCHAR) @@ -259,14 +266,14 @@ string_emulation_test (void) wchar_t itow1[33]; - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itow1, 2), - ACE_TEXT_WIDE ("101010")) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (42, itow1, 2), + ACE_TEXT_WIDE ("101010")) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itow1, 3), - ACE_TEXT_WIDE ("1120")) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (42, itow1, 3), + ACE_TEXT_WIDE ("1120")) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itow1, 16), - ACE_TEXT_WIDE ("2a")) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (42, itow1, 16), + ACE_TEXT_WIDE ("2a")) == 0); // ======================================================================== @@ -279,11 +286,11 @@ string_emulation_test (void) const wchar_t *strcmp4 = ACE_TEXT_WIDE ("STRINGF"); const wchar_t *strcmp5 = ACE_TEXT_WIDE ("stringe"); - ACE_ASSERT (ACE_OS_String::strcmp (strcmp1, strcmp1) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (strcmp1, strcmp2) < 0); - ACE_ASSERT (ACE_OS_String::strcmp (strcmp1, strcmp3) < 0); - ACE_ASSERT (ACE_OS_String::strcmp (strcmp1, strcmp4) != 0); - ACE_ASSERT (ACE_OS_String::strcmp (strcmp1, strcmp5) > 0); + ACE_ASSERT (ACE_OS::strcmp (strcmp1, strcmp1) == 0); + ACE_ASSERT (ACE_OS::strcmp (strcmp1, strcmp2) < 0); + ACE_ASSERT (ACE_OS::strcmp (strcmp1, strcmp3) < 0); + ACE_ASSERT (ACE_OS::strcmp (strcmp1, strcmp4) != 0); + ACE_ASSERT (ACE_OS::strcmp (strcmp1, strcmp5) > 0); // ======================================================================== // Test strcpy (wchar_t version) @@ -293,9 +300,9 @@ string_emulation_test (void) wchar_t strcpy2[27]; ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strcpy (strcpy2, strcpy1), - strcpy1) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (strcpy2, strcpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strcpy (strcpy2, strcpy1), + strcpy1) == 0); + ACE_ASSERT (ACE_OS::strcmp (strcpy2, strcpy1) == 0); // ======================================================================== // Test strcat (wchar_t version) @@ -306,9 +313,9 @@ string_emulation_test (void) const wchar_t *strcat3 = ACE_TEXT_WIDE ("mnopqrstuvwxyz"); ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strcat (strcat2, strcat3), - strcat1) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (strcat2, strcat1) == 0); + (ACE_OS::strcmp (ACE_OS::strcat (strcat2, strcat3), + strcat1) == 0); + ACE_ASSERT (ACE_OS::strcmp (strcat2, strcat1) == 0); // ======================================================================== // Test strncat (wchar_t version) @@ -319,9 +326,9 @@ string_emulation_test (void) const wchar_t *strncat3 = ACE_TEXT_WIDE ("mnopqrstuvwxyzabc"); ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strncat (strncat2, strncat3, 14), - strncat1) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (strncat2, strncat1) == 0); + (ACE_OS::strcmp (ACE_OS::strncat (strncat2, strncat3, 14), + strncat1) == 0); + ACE_ASSERT (ACE_OS::strcmp (strncat2, strncat1) == 0); // ======================================================================== // Test strspn (wchar_t version) @@ -329,10 +336,10 @@ string_emulation_test (void) const wchar_t *strspn1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (ACE_OS_String::strspn (strspn1, - ACE_TEXT_WIDE ("abcdf")) == 4); - ACE_ASSERT (ACE_OS_String::strspn (strspn1, - ACE_TEXT_WIDE ("mno")) == 0); + ACE_ASSERT (ACE_OS::strspn (strspn1, + ACE_TEXT_WIDE ("abcdf")) == 4); + ACE_ASSERT (ACE_OS::strspn (strspn1, + ACE_TEXT_WIDE ("mno")) == 0); // ======================================================================== // Test strchr (wchar_t version) @@ -340,11 +347,11 @@ string_emulation_test (void) const wchar_t *strchr1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (*ACE_OS_String::strchr (strchr1, ACE_TEXT_WIDE ('h')) - == ACE_TEXT_WIDE ('h')); - ACE_ASSERT (ACE_OS_String::strchr (strchr1, ACE_TEXT_WIDE ('h')) - == strchr1 + 7); - ACE_ASSERT (ACE_OS_String::strchr (strchr1, ACE_TEXT_WIDE ('1')) == NULL); + ACE_ASSERT (*ACE_OS::strchr (strchr1, ACE_TEXT_WIDE ('h')) + == ACE_TEXT_WIDE ('h')); + ACE_ASSERT (ACE_OS::strchr (strchr1, ACE_TEXT_WIDE ('h')) + == strchr1 + 7); + ACE_ASSERT (ACE_OS::strchr (strchr1, ACE_TEXT_WIDE ('1')) == NULL); // ======================================================================== // Test strstr (wchar_t version) @@ -352,13 +359,13 @@ string_emulation_test (void) const wchar_t *strstr1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (ACE_OS_String::strncmp ( - ACE_OS_String::strstr (strstr1, ACE_TEXT_WIDE ("def")), + ACE_ASSERT (ACE_OS::strncmp ( + ACE_OS::strstr (strstr1, ACE_TEXT_WIDE ("def")), ACE_TEXT_WIDE ("def"), 3) == 0); - ACE_ASSERT (ACE_OS_String::strstr (strstr1, - ACE_TEXT_WIDE ("mno")) == 0); + ACE_ASSERT (ACE_OS::strstr (strstr1, + ACE_TEXT_WIDE ("mno")) == 0); // ======================================================================== // Test strlen (wchar_t version) @@ -367,8 +374,8 @@ string_emulation_test (void) const wchar_t *strlen1 = ACE_TEXT_WIDE (""); const wchar_t *strlen2 = ACE_TEXT_WIDE ("12345"); - ACE_ASSERT (ACE_OS_String::strlen (strlen1) == 0); - ACE_ASSERT (ACE_OS_String::strlen (strlen2) == 5); + ACE_ASSERT (ACE_OS::strlen (strlen1) == 0); + ACE_ASSERT (ACE_OS::strlen (strlen2) == 5); // ======================================================================== // Test strpbrk (wchar_t version) @@ -376,9 +383,9 @@ string_emulation_test (void) const wchar_t *strpbrk1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (ACE_OS_String::strpbrk (strpbrk1, ACE_TEXT_WIDE ("ijkb")) + ACE_ASSERT (ACE_OS::strpbrk (strpbrk1, ACE_TEXT_WIDE ("ijkb")) == strpbrk1 + 1); - ACE_ASSERT (ACE_OS_String::strpbrk (strpbrk1, + ACE_ASSERT (ACE_OS::strpbrk (strpbrk1, ACE_TEXT_WIDE ("mno")) == 0); // ======================================================================== @@ -387,11 +394,11 @@ string_emulation_test (void) const wchar_t *strrchr1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (*ACE_OS_String::strrchr (strrchr1, ACE_TEXT_WIDE ('h')) + ACE_ASSERT (*ACE_OS::strrchr (strrchr1, ACE_TEXT_WIDE ('h')) == ACE_TEXT_WIDE ('h')); - ACE_ASSERT (ACE_OS_String::strrchr (strrchr1, ACE_TEXT_WIDE ('h')) + ACE_ASSERT (ACE_OS::strrchr (strrchr1, ACE_TEXT_WIDE ('h')) == strrchr1 + 18); - ACE_ASSERT (ACE_OS_String::strrchr (strrchr1, ACE_TEXT_WIDE ('1')) + ACE_ASSERT (ACE_OS::strrchr (strrchr1, ACE_TEXT_WIDE ('1')) == NULL); // ======================================================================== @@ -404,11 +411,11 @@ string_emulation_test (void) const wchar_t *strcasecmp4 = ACE_TEXT_WIDE ("STRINGF"); const wchar_t *strcasecmp5 = ACE_TEXT_WIDE ("stringe"); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp1) == 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp2) < 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp3) < 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp4) == 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp5) > 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp1) == 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp2) < 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp3) < 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp4) == 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp5) > 0); // ======================================================================== // Test strncasecmp (wchar_t version) @@ -421,15 +428,15 @@ string_emulation_test (void) const wchar_t *strncasecmp5 = ACE_TEXT_WIDE ("stringe"); ACE_ASSERT - (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp2, 7) == 0); + (ACE_OS::strncasecmp (strncasecmp1, strncasecmp2, 7) == 0); ACE_ASSERT - (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp2, 8) < 0); + (ACE_OS::strncasecmp (strncasecmp1, strncasecmp2, 8) < 0); ACE_ASSERT - (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp3, 7) < 0); + (ACE_OS::strncasecmp (strncasecmp1, strncasecmp3, 7) < 0); ACE_ASSERT - (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp4, 7) == 0); + (ACE_OS::strncasecmp (strncasecmp1, strncasecmp4, 7) == 0); ACE_ASSERT - (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp5, 7) > 0); + (ACE_OS::strncasecmp (strncasecmp1, strncasecmp5, 7) > 0); // ======================================================================== // Test strncmp (wchar_t version) @@ -441,11 +448,11 @@ string_emulation_test (void) const wchar_t *strncmp4 = ACE_TEXT_WIDE ("STRINGF"); const wchar_t *strncmp5 = ACE_TEXT_WIDE ("stringe"); - ACE_ASSERT (ACE_OS_String::strncmp (strncmp1, strncmp2, 7) == 0); - ACE_ASSERT (ACE_OS_String::strncmp (strncmp1, strncmp2, 8) < 0); - ACE_ASSERT (ACE_OS_String::strncmp (strncmp1, strncmp3, 7) < 0); - ACE_ASSERT (ACE_OS_String::strncmp (strncmp1, strncmp4, 7) != 0); - ACE_ASSERT (ACE_OS_String::strncmp (strncmp1, strncmp5, 7) > 0); + ACE_ASSERT (ACE_OS::strncmp (strncmp1, strncmp2, 7) == 0); + ACE_ASSERT (ACE_OS::strncmp (strncmp1, strncmp2, 8) < 0); + ACE_ASSERT (ACE_OS::strncmp (strncmp1, strncmp3, 7) < 0); + ACE_ASSERT (ACE_OS::strncmp (strncmp1, strncmp4, 7) != 0); + ACE_ASSERT (ACE_OS::strncmp (strncmp1, strncmp5, 7) > 0); // ======================================================================== // Test strncpy (wchar_t version) @@ -455,34 +462,34 @@ string_emulation_test (void) wchar_t strncpy2[27]; ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strncpy (strncpy2, - strncpy1, - 26), - strncpy1, - 26) == 0); + (ACE_OS::strncmp (ACE_OS::strncpy (strncpy2, + strncpy1, + 26), + strncpy1, + 26) == 0); strncpy1[26] = 0; strncpy2[26] = 0; - ACE_ASSERT (ACE_OS_String::strcmp (strncpy2, strncpy1) == 0); + ACE_ASSERT (ACE_OS::strcmp (strncpy2, strncpy1) == 0); // ======================================================================== // Test strtok (wchar_t version) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing strtok (wchar_t version)\n"))); wchar_t strtok_r1[] = ACE_TEXT_WIDE ("A string of tokens"); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok (strtok_r1, - ACE_TEXT_WIDE (" ")), - ACE_TEXT_WIDE ("A")) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok (0, - ACE_TEXT_WIDE (" ")), - ACE_TEXT_WIDE ("string") ) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok (0, - ACE_TEXT_WIDE (" ")), - ACE_TEXT_WIDE ("of") ) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok (0, - ACE_TEXT_WIDE (" ")), - ACE_TEXT_WIDE ("tokens") ) == 0); - ACE_ASSERT (ACE_OS_String::strtok (0, ACE_TEXT_WIDE (" ")) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok (strtok_r1, + ACE_TEXT_WIDE (" ")), + ACE_TEXT_WIDE ("A")) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok (0, + ACE_TEXT_WIDE (" ")), + ACE_TEXT_WIDE ("string") ) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok (0, + ACE_TEXT_WIDE (" ")), + ACE_TEXT_WIDE ("of") ) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok (0, + ACE_TEXT_WIDE (" ")), + ACE_TEXT_WIDE ("tokens") ) == 0); + ACE_ASSERT (ACE_OS::strtok (0, ACE_TEXT_WIDE (" ")) == 0); } @@ -529,7 +536,7 @@ ctime_r_test (void) if (result == 0) { ACE_TCHAR bufcheck[27]; - ACE_OS_String::strcpy (bufcheck, buf); + ACE_OS::strcpy (bufcheck, buf); if (ACE_OS::ctime_r (&secs, buf, 10) != 0) { ACE_ERROR ((LM_ERROR, @@ -545,7 +552,7 @@ ctime_r_test (void) result = -1; } // Make sure it didn't scribble - else if (ACE_OS_String::strcmp (buf, bufcheck) != 0) + else if (ACE_OS::strcmp (buf, bufcheck) != 0) { result = -1; ACE_ERROR ((LM_ERROR, @@ -571,60 +578,60 @@ string_strsncpy_test (void) // strsncpy() where the max. length doesn't matter ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 36), - strsncpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 36), + strsncpy1) == 0); // strsncpy() where the max length does matter ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 26), - strsncpy1, - 25) == 0); + (ACE_OS::strncmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 26), + strsncpy1, + 25) == 0); // strsncpy1 and strsncpy2 are different size --> not equal - ACE_ASSERT (ACE_OS_String::strcmp (strsncpy2, strsncpy1) != 0); + ACE_ASSERT (ACE_OS::strcmp (strsncpy2, strsncpy1) != 0); // max. length == 2 --> 1 char available ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 2), - strsncpy1, - 1) == 0); + (ACE_OS::strncmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 2), + strsncpy1, + 1) == 0); // max length == 1 --> empty string ACE_ASSERT - (ACE_OS_String::strlen (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 1)) == 0); + (ACE_OS::strlen (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 1)) == 0); // just preparation for the next assert ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 36), - strsncpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 36), + strsncpy1) == 0); // A tricky one, if the max. length == 0 --> do nothing // so the strsncpy2 shouldn't change ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strsncpy (strsncpy2, - "test", - 0), - strsncpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strsncpy (strsncpy2, + "test", + 0), + strsncpy1) == 0); // If src == dst --> truncate dst if needed! ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy2, - 10), - strsncpy1, - 9) == 0); + (ACE_OS::strncmp (ACE_OS::strsncpy (strsncpy2, + strsncpy2, + 10), + strsncpy1, + 9) == 0); // size should be 9 (+ '\0' char) - ACE_ASSERT(ACE_OS_String::strlen(strsncpy2) == 9); + ACE_ASSERT(ACE_OS::strlen(strsncpy2) == 9); } @@ -639,61 +646,61 @@ string_strsncpy_test (void) // strsncpy() where the max. length doesn't matter ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 36), - strsncpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 36), + strsncpy1) == 0); // strsncpy() where the max length does matter ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 26), - strsncpy1, - 25) == 0); + (ACE_OS::strncmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 26), + strsncpy1, + 25) == 0); // strsncpy1 and strsncpy2 are different size --> not equal - ACE_ASSERT (ACE_OS_String::strcmp (strsncpy2, strsncpy1) != 0); + ACE_ASSERT (ACE_OS::strcmp (strsncpy2, strsncpy1) != 0); // max. length == 2 --> 1 char available ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 2), - strsncpy1, - 1) == 0); + (ACE_OS::strncmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 2), + strsncpy1, + 1) == 0); // max length == 1 --> empty string ACE_ASSERT - (ACE_OS_String::strlen (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 1)) == 0); + (ACE_OS::strlen (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 1)) == 0); // just preparation for the next assert ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 36), - strsncpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 36), + strsncpy1) == 0); // A tricky one, if the max. length == 0 --> do nothing // so the strsncpy2 shouldn't change ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strsncpy (strsncpy2, - ACE_TEXT_WIDE -("test"), - 0), - strsncpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strsncpy (strsncpy2, + ACE_TEXT_WIDE + ("test"), + 0), + strsncpy1) == 0); // If src == dst --> truncate dst if needed! ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy2, - 10), - strsncpy1, - 9) == 0); + (ACE_OS::strncmp (ACE_OS::strsncpy (strsncpy2, + strsncpy2, + 10), + strsncpy1, + 9) == 0); // size should be 9 (+ '\0' char) - ACE_ASSERT(ACE_OS_String::strlen(strsncpy2) == 9); + ACE_ASSERT(ACE_OS::strlen(strsncpy2) == 9); } #endif /* ACE_HAS_WCHAR */ diff --git a/tests/Obstack_Test.cpp b/tests/Obstack_Test.cpp index fde46168f7d..516ff79e83b 100644 --- a/tests/Obstack_Test.cpp +++ b/tests/Obstack_Test.cpp @@ -16,7 +16,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #include "ace/Obstack.h" #include "ace/Log_Msg.h" #include "test_config.h" @@ -35,7 +35,7 @@ int run_main (int, ACE_TCHAR *[]) const ACE_TCHAR str2[] = ACE_TEXT ("It's fleece was white as snow; but...."); ACE_Obstack_T<ACE_TCHAR> stack (sizeof (str1) + 1); - for (size_t i = 0; i < ACE_OS_String::strlen (str1); i++) + for (size_t i = 0; i < ACE_OS::strlen (str1); i++) stack.grow_fast (str1[i]); ACE_TCHAR *str = stack.freeze (); @@ -45,7 +45,7 @@ int run_main (int, ACE_TCHAR *[]) ACE_ERROR ((LM_ERROR, ACE_TEXT ("freeze failed!\n"))); ++errors; } - else if (ACE_OS_String::strcmp (str, str1) != 0) + else if (ACE_OS::strcmp (str, str1) != 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT("Lost first string; expected: %s, have: %s\n"), @@ -53,7 +53,7 @@ int run_main (int, ACE_TCHAR *[]) ++errors; } - for (size_t j = 0; j < ACE_OS_String::strlen (str2); ++j) + for (size_t j = 0; j < ACE_OS::strlen (str2); ++j) stack.grow (str2[j]); ACE_TCHAR* temp = stack.freeze(); @@ -71,7 +71,7 @@ int run_main (int, ACE_TCHAR *[]) ++errors; } - for (size_t k = 0; k < ACE_OS_String::strlen (str1); ++k) + for (size_t k = 0; k < ACE_OS::strlen (str1); ++k) stack.grow (str1[k]); ACE_TCHAR* tmp = stack.freeze (); @@ -80,7 +80,7 @@ int run_main (int, ACE_TCHAR *[]) ACE_ERROR ((LM_ERROR, ACE_TEXT ("freeze failed!\n"))); ++errors; } - else if (ACE_OS_String::strcmp (tmp, str1) != 0) + else if (ACE_OS::strcmp (tmp, str1) != 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Lost third string; expected: %s, have: %s\n"), @@ -90,7 +90,7 @@ int run_main (int, ACE_TCHAR *[]) stack.unwind (temp); - for (size_t l = 0; l < ACE_OS_String::strlen (str2); ++l) + for (size_t l = 0; l < ACE_OS::strlen (str2); ++l) stack.grow (str2[l]); temp = stack.freeze(); diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp index 188317be335..f1767c1af48 100644 --- a/tests/Pipe_Test.cpp +++ b/tests/Pipe_Test.cpp @@ -21,6 +21,7 @@ #include "ace/Process.h" #include "ace/Get_Opt.h" #include "ace/ACE.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(tests, Pipe_Test, "$Id$") diff --git a/tests/Priority_Task_Test.cpp b/tests/Priority_Task_Test.cpp index 197c28e8b0e..fe883d27573 100644 --- a/tests/Priority_Task_Test.cpp +++ b/tests/Priority_Task_Test.cpp @@ -21,6 +21,7 @@ #include "test_config.h" #include "ace/Task.h" #include "ace/Sched_Params.h" +#include "ace/OS_NS_errno.h" ACE_RCSID(tests, Priority_Task_Test, "$Id$") diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp index bb42a90d68d..4b1821f191f 100644 --- a/tests/Proactor_Test.cpp +++ b/tests/Proactor_Test.cpp @@ -40,6 +40,8 @@ ACE_RCSID (tests, #include "ace/Asynch_Connector.h" #include "ace/Task.h" #include "ace/Thread_Semaphore.h" +#include "ace/OS_NS_signal.h" +#include "ace/os_include/netinet/os_tcp.h" #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp index 38623975e06..42dbfb82d8a 100644 --- a/tests/Process_Mutex_Test.cpp +++ b/tests/Process_Mutex_Test.cpp @@ -17,11 +17,13 @@ // ============================================================================ #include "test_config.h" -#include "ace/Synch.h" +#include "ace/Mutex.h" #include "ace/Process.h" #include "ace/Process_Mutex.h" #include "ace/Get_Opt.h" #include "ace/ACE.h" +#include "ace/OS_NS_stdio.h" +#include "ace/os_include/os_dirent.h" ACE_RCSID(tests, Process_Mutex_Test, "$Id$") diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp index 80dd3a31f11..d871dce2133 100644 --- a/tests/Process_Strategy_Test.cpp +++ b/tests/Process_Strategy_Test.cpp @@ -197,7 +197,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("Temporary path too long\n")), -1); - ACE_OS_String::strcat (this->filename_, ACE_TEXT ("process_strategy_test_temp")); + ACE_OS::strcat (this->filename_, ACE_TEXT ("process_strategy_test_temp")); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/tests/RB_Tree_Test.cpp b/tests/RB_Tree_Test.cpp index afdae22f04d..5ca2df7bcc7 100644 --- a/tests/RB_Tree_Test.cpp +++ b/tests/RB_Tree_Test.cpp @@ -29,7 +29,7 @@ #include "test_config.h" /* Include first to enable ACE_ASSERT. */ #include "ace/RB_Tree.h" #include "ace/SString.h" -#include "ace/Synch.h" +#include "ace/Null_Mutex.h" #include "RB_Tree_Test.h" diff --git a/tests/RMCast/Main.cpp b/tests/RMCast/Main.cpp index e80f79ca2c2..44b92128394 100644 --- a/tests/RMCast/Main.cpp +++ b/tests/RMCast/Main.cpp @@ -17,7 +17,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_HAS_WINCE) # include "ace/ACE.h" #endif /* ACE_HAS_WINCE */ diff --git a/tests/RMCast/RMCast_Fragment_Test.cpp b/tests/RMCast/RMCast_Fragment_Test.cpp index 5ff54679a0c..9d04bc72fb7 100644 --- a/tests/RMCast/RMCast_Fragment_Test.cpp +++ b/tests/RMCast/RMCast_Fragment_Test.cpp @@ -15,6 +15,7 @@ #include "ace/Message_Block.h" #include "ace/Task.h" #include "ace/RMCast/RMCast_Fragment.h" +#include "ace/OS_NS_time.h" ACE_RCSID(tests, RMCast_Fragment_Test, "$Id$") diff --git a/tests/RMCast/RMCast_Membership_Test.cpp b/tests/RMCast/RMCast_Membership_Test.cpp index 8e6b716cded..4a34a73c5fd 100644 --- a/tests/RMCast/RMCast_Membership_Test.cpp +++ b/tests/RMCast/RMCast_Membership_Test.cpp @@ -14,7 +14,7 @@ #include "ace/RMCast/RMCast_Proxy.h" #include "ace/RMCast/RMCast_Membership.h" #include "ace/ACE.h" - +#include "ace/OS_NS_time.h" #include "ace/Task.h" ACE_RCSID(tests, RMCast_Membership_Test, "$Id$") diff --git a/tests/RMCast/RMCast_Reassembly_Test.cpp b/tests/RMCast/RMCast_Reassembly_Test.cpp index 1e12fc8af4e..48e49fdd907 100644 --- a/tests/RMCast/RMCast_Reassembly_Test.cpp +++ b/tests/RMCast/RMCast_Reassembly_Test.cpp @@ -14,6 +14,7 @@ #include "ace/Task.h" #include "ace/ACE.h" #include "ace/RMCast/RMCast_Reassembly.h" +#include "ace/OS_NS_time.h" ACE_RCSID(tests, RMCast_Reassembly_Test, "$Id$") diff --git a/tests/RMCast/RMCast_Reordering_Test.cpp b/tests/RMCast/RMCast_Reordering_Test.cpp index e17f8b5cabb..f06ea6477c7 100644 --- a/tests/RMCast/RMCast_Reordering_Test.cpp +++ b/tests/RMCast/RMCast_Reordering_Test.cpp @@ -3,6 +3,7 @@ #include "../test_config.h" #include "ace/RMCast/RMCast_Proxy.h" #include "ace/RMCast/RMCast_Reordering.h" +#include "ace/OS_NS_time.h" #include "ace/Task.h" diff --git a/tests/RMCast/RMCast_Retransmission_Test.cpp b/tests/RMCast/RMCast_Retransmission_Test.cpp index 1fdaaeeb601..f5fc31d5955 100644 --- a/tests/RMCast/RMCast_Retransmission_Test.cpp +++ b/tests/RMCast/RMCast_Retransmission_Test.cpp @@ -3,6 +3,7 @@ #include "../test_config.h" #include "ace/RMCast/RMCast_Proxy.h" #include "ace/RMCast/RMCast_Retransmission.h" +#include "ace/OS_NS_time.h" #include "ace/Task.h" diff --git a/tests/Reactor_Notify_Test.cpp b/tests/Reactor_Notify_Test.cpp index f7bd0c3671e..0136a75f64c 100644 --- a/tests/Reactor_Notify_Test.cpp +++ b/tests/Reactor_Notify_Test.cpp @@ -22,12 +22,13 @@ // ============================================================================ #include "test_config.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" #include "ace/Task.h" #include "ace/Pipe.h" #include "ace/Auto_Ptr.h" #include "ace/Reactor.h" #include "ace/Select_Reactor.h" +#include "ace/Thread_Semaphore.h" ACE_RCSID(tests, Reactor_Notify_Test, "$Id$") diff --git a/tests/Reader_Writer_Test.cpp b/tests/Reader_Writer_Test.cpp index 468bff43479..7e270d646e8 100644 --- a/tests/Reader_Writer_Test.cpp +++ b/tests/Reader_Writer_Test.cpp @@ -24,6 +24,8 @@ #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" #include "ace/Atomic_Op.h" +#include "ace/OS_NS_unistd.h" +#include "ace/Time_Value.h" ACE_RCSID(tests, Reader_Writer_Test, "$Id$") diff --git a/tests/Reverse_Lock_Test.cpp b/tests/Reverse_Lock_Test.cpp index e69f97ecbd8..7cc83e5e929 100644 --- a/tests/Reverse_Lock_Test.cpp +++ b/tests/Reverse_Lock_Test.cpp @@ -19,7 +19,10 @@ // ============================================================================ #include "test_config.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Guard_T.h" +#include "ace/Reverse_Lock_T.h" ACE_RCSID(tests, Reverse_Lock_Test, "$Id$") diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp index 45dbac561b0..5f7a5bb1899 100644 --- a/tests/SOCK_Connector_Test.cpp +++ b/tests/SOCK_Connector_Test.cpp @@ -18,10 +18,12 @@ // ========================================================================== #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_Stream.h" +#include "ace/OS_NS_sys_utsname.h" +#include "ace/OS_NS_netdb.h" ACE_RCSID(tests, SOCK_Connector_Test, "SOCK_Connector_Test.cpp,v 4.34 2000/04/23 21:29:17 brunsch Exp") diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp index c8aa7b059b8..495dff5a494 100644 --- a/tests/SOCK_Send_Recv_Test.cpp +++ b/tests/SOCK_Send_Recv_Test.cpp @@ -25,7 +25,7 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_sys_wait.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" #include "ace/SOCK_Connector.h" diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp index db2a630a594..bdfa79f2a6a 100644 --- a/tests/SOCK_Test.cpp +++ b/tests/SOCK_Test.cpp @@ -21,7 +21,8 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_sys_select.h" +#include "ace/OS_NS_sys_wait.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" #include "ace/SOCK_Connector.h" diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp index 0f472e9f918..c8ac22b648a 100644 --- a/tests/SPIPE_Test.cpp +++ b/tests/SPIPE_Test.cpp @@ -22,7 +22,6 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" #include "ace/SPIPE_Addr.h" diff --git a/tests/SSL/Main.cpp b/tests/SSL/Main.cpp index e80f79ca2c2..44b92128394 100644 --- a/tests/SSL/Main.cpp +++ b/tests/SSL/Main.cpp @@ -17,7 +17,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_HAS_WINCE) # include "ace/ACE.h" #endif /* ACE_HAS_WINCE */ diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp index 8e69393b972..3561fac9e7c 100644 --- a/tests/Semaphore_Test.cpp +++ b/tests/Semaphore_Test.cpp @@ -18,10 +18,13 @@ // ============================================================================ #include "test_config.h" -#include "ace/Synch.h" +#include "ace/Thread_Semaphore.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Semaphore_Test, "$Id$") diff --git a/tests/Signal_Test.cpp b/tests/Signal_Test.cpp index f0767e2e608..cbb8298c306 100644 --- a/tests/Signal_Test.cpp +++ b/tests/Signal_Test.cpp @@ -25,6 +25,7 @@ #include "ace/Get_Opt.h" #include "ace/ARGV.h" #include "ace/ACE.h" +#include "ace/OS_NS_signal.h" ACE_RCSID(tests, Signal_Test, "$Id$") diff --git a/tests/Sigset_Ops_Test.cpp b/tests/Sigset_Ops_Test.cpp index 45988cfb6d2..3c6f4439fc0 100644 --- a/tests/Sigset_Ops_Test.cpp +++ b/tests/Sigset_Ops_Test.cpp @@ -19,7 +19,8 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_signal.h" +#include "ace/OS_NS_errno.h" ACE_RCSID(tests, Sigset_Ops_Test, "$Id$") diff --git a/tests/Simple_Message_Block_Test.cpp b/tests/Simple_Message_Block_Test.cpp index 2e727410c38..788ab0fff3e 100644 --- a/tests/Simple_Message_Block_Test.cpp +++ b/tests/Simple_Message_Block_Test.cpp @@ -21,7 +21,10 @@ #include "test_config.h" #include "ace/Message_Block.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Lock_Adapter_T.h" +#include "ace/OS_NS_string.h" +#include "ace/Thread_Mutex.h" ACE_RCSID(tests, Simple_Message_Block_Test, "$Id$") diff --git a/tests/TP_Reactor_Test.cpp b/tests/TP_Reactor_Test.cpp index bf47bb328d2..61039f41f14 100644 --- a/tests/TP_Reactor_Test.cpp +++ b/tests/TP_Reactor_Test.cpp @@ -61,6 +61,9 @@ #include "ace/Reactor.h" #include "ace/TP_Reactor.h" +#include "ace/OS_NS_signal.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Semaphore.h" ACE_RCSID(TPReactor, TPReactor_Test, "TPReactor_Test.cpp,v 1.27 2000/03/07 17:15:56 schmidt Exp") @@ -822,7 +825,7 @@ Sender::initiate_write (void) { if ( this->msg_queue ()->message_count () < 20) // flow control { - size_t nbytes = ACE_OS_String::strlen (send_buf_); + size_t nbytes = ACE_OS::strlen (send_buf_); ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, diff --git a/tests/TP_Reactor_Test.h b/tests/TP_Reactor_Test.h index db6728c3763..a04a6e5ca1a 100644 --- a/tests/TP_Reactor_Test.h +++ b/tests/TP_Reactor_Test.h @@ -20,7 +20,6 @@ #ifndef ACE_TESTS_TP_REACTOR_TEST_H #define ACE_TESTS_TP_REACTOR_TEST_H -#include "ace/OS.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" diff --git a/tests/TSS_Test.cpp b/tests/TSS_Test.cpp index 1515af06be4..2da81d0ab3d 100644 --- a/tests/TSS_Test.cpp +++ b/tests/TSS_Test.cpp @@ -21,7 +21,7 @@ // ============================================================================ #include "test_config.h" -#include "ace/Synch.h" +#include "ace/OS_NS_unistd.h" #include "ace/Thread_Manager.h" #include "ace/Signal.h" #include "TSS_Test_Errno.h" diff --git a/tests/Test_Output.cpp b/tests/Test_Output.cpp index 4c5106d5ae8..f67fbd81549 100644 --- a/tests/Test_Output.cpp +++ b/tests/Test_Output.cpp @@ -17,7 +17,9 @@ // ============================================================================ #include "tests/test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_sys_stat.h" +#include "ace/Guard_T.h" #include "ace/Object_Manager.h" #include "ace/streams.h" #include "ace/Framework_Component.h" diff --git a/tests/Thread_Manager_Test.cpp b/tests/Thread_Manager_Test.cpp index 7bb10bfe411..ba32ecfc487 100644 --- a/tests/Thread_Manager_Test.cpp +++ b/tests/Thread_Manager_Test.cpp @@ -24,6 +24,7 @@ #include "ace/Thread_Manager.h" #include "ace/Signal.h" #include "ace/Task.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Thread_Manager_Test, "$Id$") diff --git a/tests/Thread_Mutex_Test.cpp b/tests/Thread_Mutex_Test.cpp index 79ec0f26399..f40250d6754 100644 --- a/tests/Thread_Mutex_Test.cpp +++ b/tests/Thread_Mutex_Test.cpp @@ -21,6 +21,9 @@ #include "test_config.h" #include "ace/Thread_Manager.h" #include "ace/Process_Mutex.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Thread_Mutex_Test, "$Id$") diff --git a/tests/Thread_Pool_Reactor_Resume_Test.cpp b/tests/Thread_Pool_Reactor_Resume_Test.cpp index 711457aecd7..87ea2e1fee9 100644 --- a/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -293,7 +293,7 @@ worker (void *) ACE_OS::sleep (3); const ACE_TCHAR *msg = ACE_TEXT ("Message from Connection worker"); ACE_TCHAR buf [BUFSIZ]; - buf[0] = ACE_static_cast (ACE_TCHAR, (ACE_OS_String::strlen (msg) + 1)); + buf[0] = ACE_static_cast (ACE_TCHAR, (ACE_OS::strlen (msg) + 1)); ACE_OS::strcpy (&buf[1], msg); ACE_INET_Addr addr (rendezvous); diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp index 4e818b1339e..1aeac44f713 100644 --- a/tests/Thread_Pool_Reactor_Test.cpp +++ b/tests/Thread_Pool_Reactor_Test.cpp @@ -251,7 +251,7 @@ worker (void *) ACE_OS::sleep (3); const ACE_TCHAR *msg = ACE_TEXT ("Message from Connection worker"); ACE_TCHAR buf [BUFSIZ]; - buf[0] = ACE_static_cast (ACE_TCHAR, (ACE_OS_String::strlen (msg) + 1)); + buf[0] = ACE_static_cast (ACE_TCHAR, (ACE_OS::strlen (msg) + 1)); ACE_OS::strcpy (&buf[1], msg); ACE_INET_Addr addr (rendezvous); diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp index d26bce9915c..c5bbd4e4aa0 100644 --- a/tests/Thread_Pool_Test.cpp +++ b/tests/Thread_Pool_Test.cpp @@ -31,6 +31,7 @@ ACE_RCSID(tests, Thread_Pool_Test, "$Id$") #if defined (ACE_HAS_THREADS) #include "ace/Lock_Adapter_T.h" +#include "ace/OS_NS_unistd.h" // Number of iterations to run the test. static size_t n_iterations = 100; diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp index e4d1fd4e158..94f02605775 100644 --- a/tests/Time_Service_Test.cpp +++ b/tests/Time_Service_Test.cpp @@ -66,7 +66,7 @@ run_main (int, ACE_TCHAR *[]) } // Add the filename to the end - ACE_OS_String::strcat (backing_store, + ACE_OS::strcat (backing_store, ACE_TEXT ("ace-malloc-XXXXXX")); #endif /* ACE_DEFAULT_BACKING_STORE */ diff --git a/tests/Timeprobe_Test.cpp b/tests/Timeprobe_Test.cpp index 83bb71aa4e6..541d4d06bea 100644 --- a/tests/Timeprobe_Test.cpp +++ b/tests/Timeprobe_Test.cpp @@ -25,6 +25,7 @@ #include "ace/Singleton.h" #include "ace/Synch_Traits.h" #include "ace/Recursive_Thread_Mutex.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Timeprobe_Test, "$Id$") diff --git a/tests/Timer_Queue_Reference_Counting_Test.cpp b/tests/Timer_Queue_Reference_Counting_Test.cpp index 9b4b9cf70e5..52c38bc0df5 100644 --- a/tests/Timer_Queue_Reference_Counting_Test.cpp +++ b/tests/Timer_Queue_Reference_Counting_Test.cpp @@ -27,6 +27,7 @@ #include "ace/Reactor.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/Null_Mutex.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Timer_Queue_Reference_Counting_Test, "$Id$") diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp index 6ca67a9aafd..0ea7e561998 100644 --- a/tests/Timer_Queue_Test.cpp +++ b/tests/Timer_Queue_Test.cpp @@ -33,6 +33,7 @@ #include "ace/Timer_Queue.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/Null_Mutex.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Timer_Queue_Test, "$Id$") diff --git a/tests/Upgradable_RW_Test.h b/tests/Upgradable_RW_Test.h index cfcee6a0675..41c6c0dba1e 100644 --- a/tests/Upgradable_RW_Test.h +++ b/tests/Upgradable_RW_Test.h @@ -22,7 +22,7 @@ #define ACE_TESTS_UPGRADABLE_RW_TEST_H #include "test_config.h" -#include "ace/Synch.h" +#include "ace/Barrier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/websvcs/lib/URL_Addr.cpp b/websvcs/lib/URL_Addr.cpp index 43a471075aa..38cd14eb8f0 100644 --- a/websvcs/lib/URL_Addr.cpp +++ b/websvcs/lib/URL_Addr.cpp @@ -6,6 +6,9 @@ #include "URL_Addr.i" #endif /* __ACE_INLINE__ */ +#include "ace/OS_NS_strings.h" +#include "ace/OS_NS_stdio.h" + ACE_RCSID(ace, URL_Addr, "$Id$") static ACE_TCHAR http[] = ACE_TEXT ("http:"); diff --git a/websvcs/lib/URL_Addr.i b/websvcs/lib/URL_Addr.i index 89ca74d8b7a..2e3c8ddba89 100644 --- a/websvcs/lib/URL_Addr.i +++ b/websvcs/lib/URL_Addr.i @@ -1,8 +1,9 @@ +// -*- C++ -*- // $Id$ // **************************************************************** -#include "ace/OS.h" +#include "ace/OS_NS_string.h" ACE_INLINE ACE_URL_Addr::ACE_URL_Addr (const ACE_URL_Addr& address) |