Mon Sep 13 09:25:22 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * bin/generate_doxygen.pl:
          Updated for DAnCE move

        * ace/ETCL/ETCL_Constraint.cpp:
        * ace/ETCL/ETCL_l.cpp.diff:
        * ace/ETCL/ETCL_l.cpp:
        * ace/Makefile.am:
        * ace/Thread_Control.inl:
        * ace/ace.mpc:
        * ace/ace_for_tao.mpc:
        * apps/JAWS3/bench/average.cpp:
        * apps/JAWS3/bench/mkfiles.cpp:
        * apps/JAWS3/bench/rqfiles.cpp:
        * apps/JAWS3/http/HTTP_Data.h:
        * apps/JAWS3/http/HTTP_Service_Handler.h:
        * apps/JAWS3/http/HTTP_Service_Handler.cpp:
        * apps/JAWS3/http/HTTP_States.h:
        * apps/JAWS3/jaws3-todo/Reactive_Socket.h:
        * apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.h:
        * apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.cpp:
        * apps/JAWS3/jaws3-todo/Socket.h:
        * apps/JAWS3/jaws3/Concurrency_T.h:
        * apps/JAWS3/small/SS_Data.h:
        * apps/JAWS3/small/SS_Service_Handler.h:
        * apps/JAWS3/small/SS_Service_Handler.cpp:
        * apps/JAWS3/small/SS_State_DONE.h:
        * apps/JAWS3/small/SS_State_DONE.cpp:
        * apps/JAWS3/small/SS_State_ERROR.h:
        * apps/JAWS3/small/SS_State_ERROR.cpp:
        * apps/JAWS3/small/SS_State_PARSE.h:
        * apps/JAWS3/small/SS_State_PARSE.cpp:
        * apps/JAWS3/small/SS_State_READ.h:
        * apps/JAWS3/small/SS_State_READ.cpp:
        * apps/JAWS3/small/SS_State_WRITE.h:
        * apps/JAWS3/small/SS_State_WRITE.cpp:
        * apps/JAWS3/small/SS_Templates.cpp:
        * contrib/FaCE/FaCE.h:
        * examples/APG/Svc_Config/HA_Status_Dynamic.h:
        * examples/APG/Svc_Config/HA_Status_Static.h:
        * examples/Reactor/TP_Reactor/client.cpp:
        * examples/Reactor/TP_Reactor/server.cpp:
        * protocols/ace/HTBP/HTBP_Channel.cpp:
        * protocols/ace/HTBP/HTBP_Filter.h:
        * protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp:
        * protocols/ace/HTBP/HTBP_Session.cpp:
        * protocols/ace/TMCast/Group.cpp:
        * protocols/examples/RMCast/Send_Msg/Sender.cpp:
        * protocols/tests/HTBP/Reactor_Tests/client.cpp:
        * protocols/tests/HTBP/Reactor_Tests/server.cpp:
        * protocols/tests/HTBP/Reactor_Tests/test_config.h:
        * protocols/tests/HTBP/Send_Large_Msg/client.cpp:
        * protocols/tests/HTBP/Send_Large_Msg/server.cpp:
        * protocols/tests/HTBP/Send_Recv_Tests/client.cpp:
        * protocols/tests/HTBP/Send_Recv_Tests/server.cpp:
        * protocols/tests/HTBP/ping/client.cpp:
        * protocols/tests/HTBP/ping/server.cpp:
        * protocols/tests/RMCast/Sender.cpp:
        * tests/Based_Pointer_Test.cpp:
        * tests/Bug_2980_Regression_Dll.cpp:
        * tests/SSL/Bug_2912_Regression_Test.cpp:
          Removed include of ace/OS.h, only in a few files we really had
          to add an include of OS_NS_*.h

        * ace/OS.h:
        * ace/OS.inl:
        * ace/OS.cpp:
          Removed these files, replaced with OS_NS_* files a long time ago

3 files changed, 9 insertions, 15 deletions

diff --git a/ACE/ace/ETCL/ETCL_Constraint.cpp b/ACE/ace/ETCL/ETCL_Constraint.cpp
index ff711a9849d..7ab1e930aa2 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.cpp
+++ b/ACE/ace/ETCL/ETCL_Constraint.cpp
@@ -38,17 +38,13 @@ ETCL_Literal_Constraint::ETCL_Literal_Constraint (
 }
 
 ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    ACE_CDR::ULong uinteger
-  )
-  : type_ (ACE_ETCL_UNSIGNED)
+    ACE_CDR::ULong uinteger) : type_ (ACE_ETCL_UNSIGNED)
 {
   this->op_.uinteger_ = uinteger;
 }
 
 ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    ACE_CDR::Long integer
-  )
-  : type_ (ACE_ETCL_SIGNED)
+    ACE_CDR::Long integer) : type_ (ACE_ETCL_SIGNED)
 {
   this->op_.integer_ = integer;
 }
@@ -62,17 +58,13 @@ ETCL_Literal_Constraint::ETCL_Literal_Constraint (
 }
 
 ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    ACE_CDR::Double doub
-  )
-  : type_ (ACE_ETCL_DOUBLE)
+    ACE_CDR::Double doub) : type_ (ACE_ETCL_DOUBLE)
 {
   this->op_.double_ = doub;
 }
 
 ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    const char* str
-  )
-  : type_ (ACE_ETCL_STRING)
+    const char* str) : type_ (ACE_ETCL_STRING)
 {
   this->op_.str_ = ACE::strnew (str);
 }
diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp
index bb343092dfc..d87f2aa72a9 100644
--- a/ACE/ace/ETCL/ETCL_l.cpp
+++ b/ACE/ace/ETCL/ETCL_l.cpp
@@ -17,12 +17,13 @@
 #endif
 #endif
 
-#include "ace/OS.h"
-
 #include "ace/ETCL/ETCL_Constraint.h"
 
 #ifdef __cplusplus
 
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stdio.h"
+
 /* Use prototypes in function declarations. */
 #define YY_USE_PROTOS
 
diff --git a/ACE/ace/ETCL/ETCL_l.cpp.diff b/ACE/ace/ETCL/ETCL_l.cpp.diff
index 2948f90be4f..2365305100d 100644
--- a/ACE/ace/ETCL/ETCL_l.cpp.diff
+++ b/ACE/ace/ETCL/ETCL_l.cpp.diff
@@ -24,7 +24,8 @@
 
 -#include <stdlib.h>
 -#include <unistd.h>
-+#include "ace/OS.h"
++#include "ace/OS_NS_unistd.h"
++#include "ace/OS_NS_stdio.h"
 
  /* Use prototypes in function declarations. */
  #define YY_USE_PROTOS