ChangeLogTag: Wed Feb 11 02:15:21 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>prism_import

23 files changed, 145 insertions, 94 deletions

diff --git a/flat/CIAO/CIAO_TAO.mwc b/flat/CIAO/CIAO_TAO.mwc
index d5809047302..a6c45e7fa80 100644
--- a/flat/CIAO/CIAO_TAO.mwc
+++ b/flat/CIAO/CIAO_TAO.mwc
@@ -7,6 +7,7 @@ workspace {
   $(ACE_ROOT)/ACEXML/common
   $(ACE_ROOT)/ACEXML/parser/parser
   $(ACE_ROOT)/ACEXML/apps/svcconf
+  $(ACE_ROOT)/contrib
   $(TAO_ROOT)/tao
   $(TAO_ROOT)/TAO_IDL
   $(TAO_ROOT)/utils
@@ -21,6 +22,8 @@ workspace {
   $(TAO_ROOT)/orbsvcs/orbsvcs/RTEvent_Serv.mpc
   $(TAO_ROOT)/orbsvcs/orbsvcs/RTEvent_Skel.mpc
   $(TAO_ROOT)/orbsvcs/orbsvcs/RTEvent.mpc
+  CCF
+  CIDLC
   DAnCE
   ciao
   ciaosvcs
diff --git a/flat/CIAO/CIAO_TAO_DAnCE.mwc b/flat/CIAO/CIAO_TAO_DAnCE.mwc
index 6545f9aa363..4bf32ec038c 100644
--- a/flat/CIAO/CIAO_TAO_DAnCE.mwc
+++ b/flat/CIAO/CIAO_TAO_DAnCE.mwc
@@ -2,33 +2,14 @@
 // $Id$
 
 workspace {
-  $(ACE_ROOT)/ace/ace.mpc
-  $(ACE_ROOT)/apps/gperf/src/gperf.mpc
-  $(ACE_ROOT)/contrib/minizip/minizip.mpc
+  $(ACE_ROOT)/ace
+  $(ACE_ROOT)/apps/gperf/src
   $(ACE_ROOT)/ACEXML/common
   $(ACE_ROOT)/ACEXML/parser/parser
   $(ACE_ROOT)/ACEXML/apps/svcconf
+  $(ACE_ROOT)/contrib
   $(TAO_ROOT)/TAO_IDL
-  $(TAO_ROOT)/utils
-  $(TAO_ROOT)/tao/tao.mpc
-  $(TAO_ROOT)/tao/PortableServer.mpc
-  $(TAO_ROOT)/tao/Valuetype.mpc
-  $(TAO_ROOT)/tao/AnyTypeCode.mpc
-  $(TAO_ROOT)/tao/DynamicAny.mpc
-  $(TAO_ROOT)/tao/DynamicInterface.mpc
-  $(TAO_ROOT)/tao/IFR_Client.mpc
-  $(TAO_ROOT)/tao/TypeCodeFactory.mpc
-  $(TAO_ROOT)/tao/CodecFactory.mpc
-  $(TAO_ROOT)/tao/Codeset.mpc
-  $(TAO_ROOT)/tao/IORTable.mpc
-  $(TAO_ROOT)/tao/PI.mpc
-  $(TAO_ROOT)/tao/Messaging.mpc
-  $(TAO_ROOT)/tao/RTCORBA.mpc
-  $(TAO_ROOT)/tao/ImR_Client.mpc
-  $(TAO_ROOT)/tao/RTPortableServer.mpc
-  $(TAO_ROOT)/tao/DiffServPolicy.mpc
-  $(TAO_ROOT)/tao/Strategies.mpc
-  $(TAO_ROOT)/tao/Utils.mpc
+  $(TAO_ROOT)/tao
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming.mpc
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Serv.mpc
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Skel.mpc
@@ -38,12 +19,12 @@ workspace {
   $(TAO_ROOT)/orbsvcs/orbsvcs/RTEvent_Serv.mpc
   $(TAO_ROOT)/orbsvcs/orbsvcs/RTEvent_Skel.mpc
   ccm
+  CIDLC/CIDLC.mwc
   ciao
   ciaosvcs
   DAnCE
   tools/Config_Handlers
   tools/XML
-  
   exclude {
     DAnCE/tests
   }
diff --git a/flat/CIAO/COPYING b/flat/CIAO/COPYING
index a42692314f5..0b4d139ae6e 100644
--- a/flat/CIAO/COPYING
+++ b/flat/CIAO/COPYING
@@ -8,7 +8,7 @@
    referred to as "DOC software") are copyrighted by [5]Douglas C.
    Schmidt and his [6]research group at [7]Washington University,
    [8]University of California, Irvine, and [9]Vanderbilt University,
-   Copyright (c) 1993-2008, all rights reserved. Since DOC software is
+   Copyright (c) 1993-2009, all rights reserved. Since DOC software is
    open-source, freely available software, you are free to use, modify,
    copy, and distribute--perpetually and irrevocably--the DOC software
    source code and object code produced from the source, as well as copy
@@ -32,20 +32,7 @@
    maintained by the [16]DOC Group at the [17]Institute for Software
    Integrated Systems (ISIS) and the [18]Center for Distributed Object
    Computing of Washington University, St. Louis for the development of
-   open-source software as part of the open-source software community. By
-   submitting comments, suggestions, code, code snippets, techniques
-   (including that of usage) and algorithms (collectively
-   ``Submissions''), submitters acknowledge that they have the right to
-   do so, that any such Submissions are given freely and unreservedly,
-   and that they waive any claims to copyright or ownership. In addition,
-   submitters acknowledge that any such Submission might become part of
-   the copyright maintained on the overall body of code that comprises
-   the DOC software. By making a Submission, submitter agree to these
-   terms. Moreover, submitters acknowledge that the incorporation or
-   modification of such Submissions is entirely at the discretion of the
-   moderators of the open-source DOC software projects or their
-   designees.
-
+   open-source software as part of the open-source software community.
    Submissions are provided by the submitter ``as is'' with no warranties
    whatsoever, including any warranty of merchantability, noninfringement
    of third party intellectual property, or fitness for any particular
@@ -83,12 +70,11 @@
    University, UC Irvine, and Vanderbilt University, may not be used to
    endorse or promote products or services derived from this source
    without express written permission from Washington University, UC
-   Irvine, or Vanderbilt University. Further, products or services
-   derived from this source may not be called ACE(TM), TAO(TM), CIAO(TM),
-   or CoSMIC(TM) nor may the name Washington University, UC Irvine, or
-   Vanderbilt University appear in their names, without express written
-   permission from Washington University, UC Irvine, and Vanderbilt
-   University.
+   Irvine, or Vanderbilt University. This license grants no permission to
+   call products or services derived from this source ACE(TM), TAO(TM),
+   CIAO(TM), or CoSMIC(TM), nor does it grant permission for the name
+   Washington University, UC Irvine, or Vanderbilt University to appear
+   in their names.
 
    If you have any suggestions, additions, comments, or questions, please
    let [20]me know.
diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index c7eba93868c..54054cdf525 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,3 +1,44 @@
+Wed Feb 11 02:15:21 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * CIAO-INSTALL.html:
+        * CIAO.mwc:
+        * CIAO_DAnCE.mwc:
+        * CIAO_TAO.mwc:
+        * CIAO_TAO_DAnCE.mwc:
+        * COPYING:
+        * ChangeLogs:
+        * NEWS:
+        * PROBLEM-REPORT-FORM:
+        * README:
+        * Release:
+        * VERSION:
+        * bin:
+        * bin/ciao_tests.lst:
+        * ciaosvcs:
+        * examples:
+        * examples/BasicSP/EC/client.cpp:
+        * examples/BasicSP/EC/controller.cpp:
+        * examples/DevGuideExamples:
+        * examples/Display/GPS/GPS_exec.cpp:
+        * examples/Display/NavDisplay/NavDisplay_exec.cpp:
+        * examples/Display/RateGen/controller.cpp:
+        * examples/Hello/Sender/starter.cpp:
+        * examples/Null_Component/StaticDAnCEApp.cpp:
+        * examples/Null_Component/descriptors/run_test.pl:
+        * examples/Swapping/Sender/starter.cpp:
+        * performance-tests:
+        * performance-tests/Benchmark/Multi_Threaded/client.cpp:
+        * performance-tests/Benchmark/RoundTrip/RoundTripEI.idl:
+        * performance-tests/Benchmark/RoundTrip/client.cpp:
+        * performance-tests/Benchmark/RoundTripClient/client.cpp:
+        * performance-tests/Protocols/Controller/Controller.cpp:
+        * performance-tests/Protocols/Receiver/Receiver_exec.cpp:
+        * performance-tests/Protocols/Sender/Sender_exec.cpp:
+        * performance-tests/mico/mico-thrput-st/client.cc:
+        * rules.ciao.GNU:
+
+          Merged in changes from HEAD. 
+        
 Wed Feb 11 01:36:39 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/Logger/Logger.mpc:
@@ -12,8 +53,8 @@ Wed Feb 11 01:36:39 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
         * tests/CIAO_ComponentServer/SimpleComponent/client.cpp:
         * tests/Minimum/Receiver/Receiver.mpc:
 
-          Windows fixes. 
-        
+          Windows fixes.
+
 Wed Feb 11 00:18:44 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * CCF:
@@ -32,7 +73,7 @@ Wed Feb 11 00:18:44 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
         * tools/IDL3_to_IDL2:
 
           Merged changes in from trunk
-        
+
 Tue Feb 10 23:31:09 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/TargetManager/TargetManager.mpc:
diff --git a/flat/CIAO/NEWS b/flat/CIAO/NEWS
index 5f3d475d394..c8fec3bb268 100644
--- a/flat/CIAO/NEWS
+++ b/flat/CIAO/NEWS
@@ -1,16 +1,30 @@
-PLANNED MAJOR CHANGES FOR NEXT RELEASE (i.e., after 0.5.7)
-===========================================================================
-. Start update of IDL/semantics to conform to 06-04-01 specification.
-  This will immediately break most CIAO specific extensions, such as shared
-  components and ReDaC.
+PLANNED CHANGES BEFORE NEXT RELEASE
+===================================
 
-. Expand support for complex types in deployment XML.
+This is advanced notification that the CIAO-0.6.7 release of CIAO will be
+the last release before a major refactoring is introduced into CIAO/DAnCE
+that will remove several features, with no planned replacement in
+their current form, such as:
 
-. Enable use of CDR encoded deployment plans.
+.  ReDaC
+.  Shared Components
+
+Some features are being temporarily removed but with planned
+replacement in the near term:
+
+.  RTEC Integration
+.  Static Deployment
+.  TargetManager
+.  RepositoryManager
+.  Swapping container
 
 PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 ===========================================================================
 
+. Expand support for complex types in deployment XML.
+
+. Enable use of CDR encoded deployment plans.
+
 . Enhance Execution Manager and Domain Application Manager to make calls
   on the Target Manager to get resource information.
 
@@ -71,9 +85,39 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 . Implement a planner to query the TargetManager and RepositoryManager
   and generate deployment plans on the fly.
 
+. Start update of IDL/semantics to conform to 06-04-01 specification.
+  This will immediately break most CIAO specific extensions, such as shared
+  components and ReDaC.
+
+USER VISIBLE CHANGES BETWEEN CIAO-0.6.8 and CIAO-0.6.9
+======================================================
+
+USER VISIBLE CHANGES BETWEEN CIAO-0.6.7 and CIAO-0.6.8
+======================================================
+
+USER VISIBLE CHANGES BETWEEN CIAO-0.6.6 and CIAO-0.6.7
+======================================================
+
+. Added the "CIAO" OCI Development Guide Examples under the directory
+  /DevGuideExamples.  NOTE this is an ongoing port of the original
+  version x.5.x examples and some are not yet 100% compatiable with the
+  current version of CIAO.
+
+USER VISIBLE CHANGES BETWEEN CIAO-0.6.5 and CIAO-0.6.6
+======================================================
+
+. None
+
+USER VISIBLE CHANGES BETWEEN CIAO-0.6.4 and CIAO-0.6.5
+======================================================
+
+. None
+
 USER VISIBLE CHANGES BETWEEN CIAO-0.6.3 and CIAO-0.6.4
 ======================================================
 
+. None
+
 USER VISIBLE CHANGES BETWEEN CIAO-0.6.2 and CIAO-0.6.3
 ======================================================
 
diff --git a/flat/CIAO/PROBLEM-REPORT-FORM b/flat/CIAO/PROBLEM-REPORT-FORM
index 58619b17740..ca20cb1c33d 100644
--- a/flat/CIAO/PROBLEM-REPORT-FORM
+++ b/flat/CIAO/PROBLEM-REPORT-FORM
@@ -43,9 +43,9 @@
 To: ciao-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    CIAO VERSION: 0.6.3
-    TAO VERSION : 1.6.3
-    ACE VERSION : 5.6.3
+    CIAO VERSION: 0.6.8
+    TAO VERSION : 1.6.8
+    ACE VERSION : 5.6.8
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/flat/CIAO/examples/BasicSP/EC/client.cpp b/flat/CIAO/examples/BasicSP/EC/client.cpp
index 2106489309f..80165cd827d 100644
--- a/flat/CIAO/examples/BasicSP/EC/client.cpp
+++ b/flat/CIAO/examples/BasicSP/EC/client.cpp
@@ -16,7 +16,7 @@
 #include "ace/OS_NS_unistd.h"
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/flat/CIAO/examples/BasicSP/EC/controller.cpp b/flat/CIAO/examples/BasicSP/EC/controller.cpp
index af7af9f77ff..40a27d1e58e 100644
--- a/flat/CIAO/examples/BasicSP/EC/controller.cpp
+++ b/flat/CIAO/examples/BasicSP/EC/controller.cpp
@@ -16,9 +16,9 @@ int rate = 3;
 int turn_on = 1;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:r:of");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:r:of"));
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -70,13 +70,12 @@ parse_args (int argc, char *argv[])
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         {
diff --git a/flat/CIAO/examples/Display/GPS/GPS_exec.cpp b/flat/CIAO/examples/Display/GPS/GPS_exec.cpp
index 45fce7e02fa..1ed6d95ca2f 100644
--- a/flat/CIAO/examples/Display/GPS/GPS_exec.cpp
+++ b/flat/CIAO/examples/Display/GPS/GPS_exec.cpp
@@ -48,7 +48,7 @@ void
 MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick *)
 {
 //   ACE_DEBUG ((LM_DEBUG,
-//            ACE_TEXT ("GPS: Received Refresh Event\n")));
+//               ACE_TEXT ("GPS: Received Refresh Event\n")));
 
   // Refresh position
   this->positionx_ += ACE_OS::rand () % DISPLACEMENT - (DISPLACEMENT/2);
diff --git a/flat/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp b/flat/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
index 109f0f69567..6d9c50a0c52 100644
--- a/flat/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
+++ b/flat/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
@@ -21,7 +21,7 @@ MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev)
   ACE_UNUSED_ARG (ev);
 
 //   ACE_DEBUG ((LM_DEBUG,
-//            ACE_TEXT ("NAVDISPLAY: Received Refresh Event\n")));
+//   ACE_TEXT ("NAVDISPLAY: Received Refresh Event\n")));
 
   // Refresh position
   HUDisplay::position_var loc =
diff --git a/flat/CIAO/examples/Display/RateGen/controller.cpp b/flat/CIAO/examples/Display/RateGen/controller.cpp
index 6416a5e0666..311ce0a1419 100644
--- a/flat/CIAO/examples/Display/RateGen/controller.cpp
+++ b/flat/CIAO/examples/Display/RateGen/controller.cpp
@@ -67,7 +67,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/flat/CIAO/examples/Hello/Sender/starter.cpp b/flat/CIAO/examples/Hello/Sender/starter.cpp
index 8069eb18b88..3900c541fc1 100644
--- a/flat/CIAO/examples/Hello/Sender/starter.cpp
+++ b/flat/CIAO/examples/Hello/Sender/starter.cpp
@@ -46,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/flat/CIAO/examples/Null_Component/StaticDAnCEApp.cpp b/flat/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
index 2916d5cfd68..817119e4cc7 100644
--- a/flat/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
+++ b/flat/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
@@ -10,8 +10,7 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Initialize the ORB so that CORBA::Any will work.
-  CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                        argv);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
                                         
   try
   {
diff --git a/flat/CIAO/examples/Swapping/Sender/starter.cpp b/flat/CIAO/examples/Swapping/Sender/starter.cpp
index 6e7d4956379..bd1e533a6b5 100644
--- a/flat/CIAO/examples/Swapping/Sender/starter.cpp
+++ b/flat/CIAO/examples/Swapping/Sender/starter.cpp
@@ -9,9 +9,9 @@ const char * message = "starters message";
 
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:m");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:m"));
   int c = 0;
 
   while ((c = get_opts ()) != -1)
@@ -48,7 +48,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/flat/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp b/flat/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
index ecfc64d6865..c684bcc1ebe 100644
--- a/flat/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
+++ b/flat/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
@@ -24,14 +24,13 @@ const char *ior4 = "file://comp4.ior";
 
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
 
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Resolve HomeFinder interface
       CORBA::Object_var obj1
diff --git a/flat/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl b/flat/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
index 3fcf634906e..1f105b46051 100644
--- a/flat/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
+++ b/flat/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
@@ -24,7 +24,7 @@ module Benchmark
    * define the component executor interface explicitly here.
    */
   local interface RoundTrip_Exec : CCM_RoundTrip, CCM_LatencyTest,
-                                 Components::SessionComponent
+                                   Components::SessionComponent
   {
   };
 
diff --git a/flat/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/flat/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index 218db8f4ae9..0b98f53156c 100644
--- a/flat/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/flat/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -27,11 +27,12 @@ int niterations = 100;
 int do_dump_history = 0;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  //parse arguments
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
-  char c;
+  // Parse arguments.
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hxk:i:"));
+  int c;
+  
   while ((c = get_opts ()) != -1)
     switch (c)
       {
@@ -52,6 +53,7 @@ parse_args (int argc, char *argv[])
         /* Could be any other parameter like -ORBSvcConf file so ignore */
        break;
       }
+      
   // Indicates sucessful parsing of the command line
   return 0;
 }
@@ -83,7 +85,7 @@ set_priority ()
 
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
@@ -91,8 +93,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       set_priority();
 
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args(argc, argv) == -1)
         {
diff --git a/flat/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp b/flat/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
index 98281dfadcc..5d75029d1bb 100644
--- a/flat/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
+++ b/flat/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
@@ -18,14 +18,13 @@
 const char *ior = "file://test.ior";
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
 
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Resolve HomeFinder interface
       CORBA::Object_var obj
diff --git a/flat/CIAO/performance-tests/Protocols/Controller/Controller.cpp b/flat/CIAO/performance-tests/Protocols/Controller/Controller.cpp
index dd541d0d8c6..95293293f3a 100644
--- a/flat/CIAO/performance-tests/Protocols/Controller/Controller.cpp
+++ b/flat/CIAO/performance-tests/Protocols/Controller/Controller.cpp
@@ -29,7 +29,7 @@ static const char *test_type = "PACED";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/flat/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp b/flat/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
index cded99657e5..9e806b77f9c 100644
--- a/flat/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
+++ b/flat/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
@@ -218,9 +218,7 @@ namespace CIDL_ReceiverImpl
     char **argv = 0;
 
     this->orb_ =
-      CORBA::ORB_init (argc,
-                      argv);
-
+      CORBA::ORB_init (argc, argv);
   }
 
   ::Protocols::CCM_test_ptr
diff --git a/flat/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp b/flat/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
index ea25575a497..da68ddafb7b 100644
--- a/flat/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
+++ b/flat/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
@@ -582,8 +582,7 @@ CIDL_SenderImpl::SenderExec_i::start (
   char **argv = 0;
 
   this->orb_ =
-    CORBA::ORB_init (argc,
-                     argv);
+    CORBA::ORB_init (argc, argv);
 
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTORB");
diff --git a/flat/CIAO/performance-tests/mico/mico-thrput-st/client.cc b/flat/CIAO/performance-tests/mico/mico-thrput-st/client.cc
index df62ac2c87c..8c3a1529975 100644
--- a/flat/CIAO/performance-tests/mico/mico-thrput-st/client.cc
+++ b/flat/CIAO/performance-tests/mico/mico-thrput-st/client.cc
@@ -30,7 +30,7 @@ int do_dump_history = 0;
 int niterations = 1000;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   //parse arguments
   ACE_Get_Opt get_opts (argc, argv, "hxi:");
diff --git a/flat/CIAO/rules.ciao.GNU b/flat/CIAO/rules.ciao.GNU
index a3c76dc47a7..d181ccdb9b2 100644
--- a/flat/CIAO/rules.ciao.GNU
+++ b/flat/CIAO/rules.ciao.GNU
@@ -16,6 +16,8 @@ ifndef CIAO_ROOT
   CIAO_ROOT = $(TAO_ROOT)/CIAO
 endif
 
+CIAO_ROOT := $(subst \,/,$(CIAO_ROOT))
+
 ifndef TAO_IDL3_TO_IDL2
   TAO_IDL3_TO_IDL2 = $(CIAO_ROOT)/tools/IDL3_TO_IDL2/tao_idl3_to_idl2
   TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)$(EXEEXT)