Tue Aug 28 10:29:00 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 26 insertions, 20 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 34ec2ce907b..63ea22aeac5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Tue Aug 28 10:29:00 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB.cpp:
+        * tao/ORB_Core.cpp:
+          Layout changes
+
+        * tao/RTCORBA.mpc:
+        * tao/RTPortableServer.mpc:
+          Simplified these files
+
 Mon Aug 27 13:29:00 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Bug_2356_Regression/client.cpp:
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index df76fb3cdb5..46222b87a7d 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1351,7 +1351,6 @@ CORBA::ORB_init (int &argc, char *argv[], const char *orbid)
 
   if (orbinitializer_registry != 0)
     {
-
       orbinitializer_registry->post_init (pre_init_count,
                                           oc.get (),
                                           command_line.get_argc(),
@@ -1392,8 +1391,8 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj)
 
       // Allow a user to provide custom object stringification
       char* user_string =
-        obj->convert_to_ior (this->use_omg_ior_format_,
-                             ior_prefix);
+        obj->convert_to_ior (this->use_omg_ior_format_, ior_prefix);
+
       if (user_string != 0)
         return user_string;
     }
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 14ba75aa527..ea9a870bd25 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -3390,8 +3390,7 @@ TAO_ORB_Core_instance (void)
 
 
 TAO::Collocation_Strategy
-TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object
-                                    )
+TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object)
 {
   TAO_Stub *stub = object->_stubobj ();
   if (!CORBA::is_nil (stub->servant_orb_var ().in ()) &&
@@ -3401,8 +3400,7 @@ TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object
         stub->servant_orb_var ()->orb_core ();
 
       const int collocated =
-        orb_core->collocation_resolver ().is_collocated (object
-                                                        );
+        orb_core->collocation_resolver ().is_collocated (object);
 
       if (collocated)
         {
diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc
index 0c8acd98922..f858df23ea8 100644
--- a/TAO/tao/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA.mpc
@@ -3,7 +3,7 @@ project : taolib, install, pi, tao_versioning_idl_defaults {
   sharedname   = TAO_RTCORBA
   dynamicflags = TAO_RTCORBA_BUILD_DLL
   requires    += rt_corba
-  idlflags    += -Sci -SS -Sorb \
+  idlflags    += -Sci -SS -Sorb -GX \
                  -Wb,export_macro=TAO_RTCORBA_Export \
                  -Wb,export_include=tao/RTCORBA/rtcorba_export.h \
                  -o RTCORBA
@@ -33,13 +33,13 @@ project : taolib, install, pi, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sa -GX \
+    idlflags += -Sa \
                 -Wb,unique_include=tao/RTCORBA/RTCORBA.h
     RTCORBA/RTCORBA_include.pidl
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -GX \
+    idlflags += -Gp -Gd \
                 -Wb,include_guard=TAO_RTCORBA_SAFE_INCLUDE \
                 -Wb,safe_include=tao/RTCORBA/RTCORBA.h
     RTCORBA/RTCORBA.pidl
diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc
index d4982f399a8..4c665a34c85 100644
--- a/TAO/tao/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer.mpc
@@ -3,6 +3,11 @@ project : taolib, install, rtcorba, portableserver, avoids_corba_e_micro {
   sharedname   = TAO_RTPortableServer
   dynamicflags = TAO_RTPORTABLESERVER_BUILD_DLL
 
+  idlflags += -Sci -SS -Sorb -GX \
+          -Wb,export_macro=TAO_RTPortableServer_Export \
+          -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h \
+          -o RTPortableServer
+
   Source_Files {
     RTPortableServer
   }
@@ -28,21 +33,15 @@ project : taolib, install, rtcorba, portableserver, avoids_corba_e_micro {
   }
 
   IDL_Files {
-    idlflags += -Gp -Gd -Sci -SS -Sorb -GX \
-                -Wb,export_macro=TAO_RTPortableServer_Export \
-                -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h \
+    idlflags += -Gp -Gd \
                 -Wb,include_guard=TAO_RT_PORTABLESERVER_SAFE_INCLUDE \
-                -Wb,safe_include=tao/RTPortableServer/RTPortableServer.h \
-                -o RTPortableServer
+                -Wb,safe_include=tao/RTPortableServer/RTPortableServer.h
     RTPortableServer/RTPortableServer.pidl
   }
 
   IDL_Files {
-    idlflags += -SS -Sorb -GX -Sci -Sa \
-                -Wb,export_macro=TAO_RTPortableServer_Export \
-                -Wb,export_include=tao/RTPortableServer/rtportableserver_export.h \
-                -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h \
-                -o RTPortableServer
+    idlflags += -Sa \
+                -Wb,unique_include=tao/RTPortableServer/RTPortableServer.h
     RTPortableServer/RTPortableServer_include.pidl
   }