ChangeLogTag: Mon Apr 24 11:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>Mon Apr 24 11:31:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>Mon Apr 24 11:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>Mon Apr 24 12:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 42 insertions, 30 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 862e120d24f..e54853e54b5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Mon Apr 24 13:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/params.cpp:
+          Small const improvement
+
+        * tao/ORB.{h,cpp}:
+          Updated CORBA::ORB::RequestSeq to CORBA::RequestSeq as the spec
+          describes. Fixes bugzilla bug 2512.
+
 Mon Apr 24 12:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/ORB.cpp:
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 0cfd556165e..12173f84e02 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -413,7 +413,7 @@ CORBA::ORB::get_default_context (CORBA::Context_ptr &
 }
 
 void
-CORBA::ORB::send_multiple_requests_oneway (const CORBA::ORB::RequestSeq &
+CORBA::ORB::send_multiple_requests_oneway (const CORBA::RequestSeq &
                                           ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
@@ -424,7 +424,7 @@ CORBA::ORB::send_multiple_requests_oneway (const CORBA::ORB::RequestSeq &
 }
 
 void
-CORBA::ORB::send_multiple_requests_deferred (const CORBA::ORB::RequestSeq &
+CORBA::ORB::send_multiple_requests_deferred (const CORBA::RequestSeq &
                                             ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index f6c0f96d0f5..e05ef0d9878 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -134,6 +134,30 @@ namespace CORBA
 
   typedef CORBA::Short ValueModifier;
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
+    // Typedefs for CORBA::RequestSeq, which is an argument of
+    // send_multiple_requests_*().
+
+    typedef
+      TAO::unbounded_object_reference_sequence<
+          CORBA::Request, CORBA::Request_var
+        >
+      RequestSeq;
+
+    typedef
+      TAO_VarSeq_Var_T<
+          RequestSeq
+        >
+      RequestSeq_var;
+
+    typedef
+      TAO_Seq_Out_T<
+          RequestSeq
+        >
+      RequestSeq_out;
+#endif
+
   /**
    * @class ORB
    *
@@ -229,27 +253,6 @@ namespace CORBA
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-    // Typedefs for CORBA::ORB::RequestSeq, which is an argument of
-    // send_multiple_requests_*().
-
-    typedef
-      TAO::unbounded_object_reference_sequence<
-          CORBA::Request, CORBA::Request_var
-        >
-      RequestSeq;
-
-    typedef
-      TAO_VarSeq_Var_T<
-          RequestSeq
-        >
-      RequestSeq_var;
-
-    typedef
-      TAO_Seq_Out_T<
-          RequestSeq
-        >
-      RequestSeq_out;
-
     void create_list (CORBA::Long count,
                       CORBA::NVList_ptr &new_list
                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
@@ -281,10 +284,10 @@ namespace CORBA
       CORBA::ServiceInformation_out service_information
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-    void send_multiple_requests_oneway (const CORBA::ORB::RequestSeq &req
+    void send_multiple_requests_oneway (const CORBA::RequestSeq &req
                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-    void send_multiple_requests_deferred (const CORBA::ORB::RequestSeq &req
+    void send_multiple_requests_deferred (const CORBA::RequestSeq &req
                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     void get_next_response (CORBA::Request_ptr &req
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index 3e2fca6b663..a06608bedb2 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -81,7 +81,7 @@ TAO_ORB_Parameters::add_endpoints (const ACE_CString &lane,
   TAO_EndpointSet endpoint_set;
 
   // Parse the additional endpoints.
-  int result =
+  int const result =
     this->parse_and_add_endpoints (additional_endpoints,
                                    endpoint_set);
 
diff --git a/TAO/tests/Bug_1676_Regression/Test.idl b/TAO/tests/Bug_1676_Regression/Test.idl
index 986c82a3fbb..9884187dc0c 100644
--- a/TAO/tests/Bug_1676_Regression/Test.idl
+++ b/TAO/tests/Bug_1676_Regression/Test.idl
@@ -2,11 +2,11 @@
 
 //=============================================================================
 /**
- * @file test.idl
+ * @file Test.idl
  *
  * $Id$
  *
- * "test" IDL interface for the Uninitialized "out" param for sequence<string> 
+ * "test" IDL interface for the Uninitialized "out" param for sequence<string>
  * can cause server to core test.
  *
  * @author Kees van Marle <kvmarle@ermedy.nl>
@@ -17,7 +17,7 @@
 module Test
 {
   typedef sequence<string> StringList;
-  
+
   /// A very simple interface
   interface Hello
   {
@@ -29,7 +29,7 @@ module Test
 
     /// Modify a string list
     void mod_stringList (inout StringList iosl);
-    
+
     /// A method to shutdown the ORB
     /**
      * This method is used to simplify the test shutdown process