ChangeLogTag:Thu May 2 15:51:17 UTC 2002 Don Hinton <dhinton@ieee.org>

15 files changed, 121 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 89fa90e3d8c..27a17e70411 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+Thu May  2 15:51:17 UTC 2002  Don Hinton  <dhinton@ieee.org>
+	
+	* ace/Unbounded_Set.cpp:  Added OS_Errno.h and Trace.h.
+
+	* ace/Dump_T.cpp:  
+	* ace/Event_Handler_T.i: 
+
+	  Added Trace.h.
+
+	* examples/Mem_Map/file-reverse.cpp: 
+	* examples/Misc/test_set.cpp:
+
+	  Added Main_Macros.h.
+
+	* examples/Reactor/Multicast/Log_Wrapper.cpp: 
+	* examples/System_V_IPC/SV_Message_Queues/test.h: 
+
+	  Added OS_String.h and prefaced string functions with ACE_OS_String::.
+
+	* websvcs/lib/URL_Addr.h: Added Default_Constants.h.
+
+	* wevsvcs/lib/URL_Addr.i: Added OS_String.h and ACE.h.
+
+	* apps/JAWS/server/HTTP_Server.h: Added svc_export.h.
+
+	* apps/JAWS/server/HTTP_Request.cpp: Added OS_String.h and used ACE_OS_String.
+
+	* apps/JAWS/server/Parser_Headers.cpp:  Added ace_ctype.h and OS_String.h.
+	  And used ACE_OS_String for string functions.
+
 Thu May  2 12:00:15 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/OS.h:  Uncommented ACE_DEFAULT_MUTEX defs since they are used
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 89fa90e3d8c..27a17e70411 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,33 @@
+Thu May  2 15:51:17 UTC 2002  Don Hinton  <dhinton@ieee.org>
+	
+	* ace/Unbounded_Set.cpp:  Added OS_Errno.h and Trace.h.
+
+	* ace/Dump_T.cpp:  
+	* ace/Event_Handler_T.i: 
+
+	  Added Trace.h.
+
+	* examples/Mem_Map/file-reverse.cpp: 
+	* examples/Misc/test_set.cpp:
+
+	  Added Main_Macros.h.
+
+	* examples/Reactor/Multicast/Log_Wrapper.cpp: 
+	* examples/System_V_IPC/SV_Message_Queues/test.h: 
+
+	  Added OS_String.h and prefaced string functions with ACE_OS_String::.
+
+	* websvcs/lib/URL_Addr.h: Added Default_Constants.h.
+
+	* wevsvcs/lib/URL_Addr.i: Added OS_String.h and ACE.h.
+
+	* apps/JAWS/server/HTTP_Server.h: Added svc_export.h.
+
+	* apps/JAWS/server/HTTP_Request.cpp: Added OS_String.h and used ACE_OS_String.
+
+	* apps/JAWS/server/Parser_Headers.cpp:  Added ace_ctype.h and OS_String.h.
+	  And used ACE_OS_String for string functions.
+
 Thu May  2 12:00:15 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/OS.h:  Uncommented ACE_DEFAULT_MUTEX defs since they are used
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 89fa90e3d8c..27a17e70411 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,33 @@
+Thu May  2 15:51:17 UTC 2002  Don Hinton  <dhinton@ieee.org>
+	
+	* ace/Unbounded_Set.cpp:  Added OS_Errno.h and Trace.h.
+
+	* ace/Dump_T.cpp:  
+	* ace/Event_Handler_T.i: 
+
+	  Added Trace.h.
+
+	* examples/Mem_Map/file-reverse.cpp: 
+	* examples/Misc/test_set.cpp:
+
+	  Added Main_Macros.h.
+
+	* examples/Reactor/Multicast/Log_Wrapper.cpp: 
+	* examples/System_V_IPC/SV_Message_Queues/test.h: 
+
+	  Added OS_String.h and prefaced string functions with ACE_OS_String::.
+
+	* websvcs/lib/URL_Addr.h: Added Default_Constants.h.
+
+	* wevsvcs/lib/URL_Addr.i: Added OS_String.h and ACE.h.
+
+	* apps/JAWS/server/HTTP_Server.h: Added svc_export.h.
+
+	* apps/JAWS/server/HTTP_Request.cpp: Added OS_String.h and used ACE_OS_String.
+
+	* apps/JAWS/server/Parser_Headers.cpp:  Added ace_ctype.h and OS_String.h.
+	  And used ACE_OS_String for string functions.
+
 Thu May  2 12:00:15 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/OS.h:  Uncommented ACE_DEFAULT_MUTEX defs since they are used
diff --git a/ace/Dump_T.cpp b/ace/Dump_T.cpp
index 97386d4ba31..e99454c7973 100644
--- a/ace/Dump_T.cpp
+++ b/ace/Dump_T.cpp
@@ -10,6 +10,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Trace.h"
+
 ACE_RCSID(ace, Dump_T, "$Id$")
 
 template <class Concrete>
diff --git a/ace/Event_Handler_T.i b/ace/Event_Handler_T.i
index b31415f7b73..a410195ae51 100644
--- a/ace/Event_Handler_T.i
+++ b/ace/Event_Handler_T.i
@@ -1,6 +1,9 @@
 /* -*- C++ -*- */
 // $Id$
 
+#include "ace/Global_Macros.h"
+#include "ace/Trace.h"
+
 template<class T> ACE_INLINE void
 ACE_Event_Handler_T<T>::op_handler (T *op)
 {
diff --git a/ace/Unbounded_Set.cpp b/ace/Unbounded_Set.cpp
index e1cf0708e6a..7ba794a7564 100644
--- a/ace/Unbounded_Set.cpp
+++ b/ace/Unbounded_Set.cpp
@@ -6,6 +6,8 @@
 #include "ace/Unbounded_Set.h"
 #include "ace/Malloc_Base.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_Errno.h"
+#include "ace/Trace.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..90c1c49522c 100644
--- a/apps/JAWS/server/HTTP_Request.cpp
+++ b/apps/JAWS/server/HTTP_Request.cpp
@@ -4,6 +4,7 @@
 #include "HTTP_Request.h"
 #include "HTTP_Helpers.h"
 #include "HTTP_Config.h"
+#include "ace/OS_String.h"
 
 ACE_RCSID(server, HTTP_Request, "$Id$")
 
@@ -97,7 +98,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_String::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_Server.h b/apps/JAWS/server/HTTP_Server.h
index 8f683297a96..32b37a324d7 100644
--- a/apps/JAWS/server/HTTP_Server.h
+++ b/apps/JAWS/server/HTTP_Server.h
@@ -29,6 +29,7 @@
 #include "ace/Task_T.h"
 #include "ace/Asynch_IO.h"
 #include "HTTP_Handler.h"
+#include "ace/svc_export.h"
 
 // Forward declaration.
 class ACE_Proactor;
diff --git a/apps/JAWS/server/Parse_Headers.cpp b/apps/JAWS/server/Parse_Headers.cpp
index dc94b1354d9..6322702035e 100644
--- a/apps/JAWS/server/Parse_Headers.cpp
+++ b/apps/JAWS/server/Parse_Headers.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "ace/Log_Msg.h"
+#include "ace/ace_ctype.h"
+#include "ace/OS_String.h"
 
 #include "Parse_Headers.h"
 
@@ -64,7 +66,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_String::strlen(ptr) + 1);
 }
 
 int
diff --git a/examples/Mem_Map/file-reverse/file-reverse.cpp b/examples/Mem_Map/file-reverse/file-reverse.cpp
index 93893c412d7..1d114bd0298 100644
--- a/examples/Mem_Map/file-reverse/file-reverse.cpp
+++ b/examples/Mem_Map/file-reverse/file-reverse.cpp
@@ -5,6 +5,7 @@
 
 #include "ace/Mem_Map.h"
 #include "ace/Log_Msg.h"
+#include "ace/Main_Macros.h"
 
 ACE_RCSID(file_reverse, file_reverse, "$Id$")
 
diff --git a/examples/Misc/test_set.cpp b/examples/Misc/test_set.cpp
index 919116b76c5..85189713750 100644
--- a/examples/Misc/test_set.cpp
+++ b/examples/Misc/test_set.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Containers.h"
 #include "ace/Log_Msg.h"
+#include "ace/Main_Macros.h"
 
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/examples/Reactor/Multicast/Log_Wrapper.cpp b/examples/Reactor/Multicast/Log_Wrapper.cpp
index 05ea986dad0..2360876e48a 100644
--- a/examples/Reactor/Multicast/Log_Wrapper.cpp
+++ b/examples/Reactor/Multicast/Log_Wrapper.cpp
@@ -3,6 +3,7 @@
 // client.C
 
 #include "Log_Wrapper.h"
+#include "ace/OS_String.h"
 
 ACE_RCSID(Multicast, Log_Wrapper, "$Id$")
 
@@ -30,9 +31,9 @@ Log_Wrapper::open (const int port, const char *mcast_addr)
   if ((host_info = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR(host_data.nodename))) == NULL)
     return -1;
   else
-    ACE_OS::memcpy ((char *) &this->log_msg_.host,
-                    (char *) host_info->h_addr,
-                    host_info->h_length);
+    ACE_OS_String::memcpy ((char *) &this->log_msg_.host,
+                           (char *) host_info->h_addr,
+                           host_info->h_length);
 
   // This starts out initialized to all zeros!
   server_ = ACE_INET_Addr (port, mcast_addr);
@@ -55,7 +56,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_String::strlen(message)+1;
   this->log_msg_.sequence_number = htonl(sequence_number_);
 
   iovec iovp[2];
diff --git a/examples/System_V_IPC/SV_Message_Queues/test.h b/examples/System_V_IPC/SV_Message_Queues/test.h
index b3da2877bc7..28074327e7e 100644
--- a/examples/System_V_IPC/SV_Message_Queues/test.h
+++ b/examples/System_V_IPC/SV_Message_Queues/test.h
@@ -2,6 +2,7 @@
 // $Id$
 
 #include "ace/OS.h"
+#include "ace/OS_String.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -20,17 +21,17 @@ public:
                 const char user[] = "",
                 const char text[] = ""): pid_ (p)
   {
-    ::strncpy (this->username_, user, 9);
-    ::strncpy (this->mtext_, text, MSGSZ);
+    ACE_OS_String::strncpy (this->username_, user, 9);
+    ACE_OS_String::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_String::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_String::strncpy (this->mtext_, text, MSGSZ); }
+  int length (void) { return sizeof *this - sizeof this->mtext_ + ACE_OS_String::strlen (this->mtext_) + 1; }
 
 protected:
   long  pid_;
diff --git a/websvcs/lib/URL_Addr.h b/websvcs/lib/URL_Addr.h
index c83edf69440..4c4d364a615 100644
--- a/websvcs/lib/URL_Addr.h
+++ b/websvcs/lib/URL_Addr.h
@@ -24,6 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "websvcs_export.h"
+#include "ace/Default_Constants.h"
 
 class ACE_URL_Addr_Visitor;
 
diff --git a/websvcs/lib/URL_Addr.i b/websvcs/lib/URL_Addr.i
index 5e4f83453f7..dc2f63eabaa 100644
--- a/websvcs/lib/URL_Addr.i
+++ b/websvcs/lib/URL_Addr.i
@@ -1,11 +1,14 @@
 // $Id$
 
+#include "ace/OS_String.h"
+#include "ace/ACE.h"
+
 // ****************************************************************
 
 ACE_INLINE
 ACE_URL_Addr::ACE_URL_Addr (const ACE_URL_Addr& address)
   :  ACE_Addr (),
-     url_ (address.url_ == 0 ? 0 : ACE_OS::strdup (address.url_))
+     url_ (address.url_ == 0 ? 0 : ACE_OS_String::strdup (address.url_))
 {
 }