ChangeLogTag:Thu Feb 17 21:48:42 2000 Carlos O'Ryan <coryan@uci.edu>

2 files changed, 43 insertions, 37 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index f93f25b97f6..6bd3b1a63f9 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,46 +1,52 @@
+Thu Feb 17 21:48:42 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * utils/catior/catior.cpp:
+          It was still printing IIOP for the SHMIOP protocol, the order of
+          the arguments for an ACE_DEBUG() call was broken.
+
 Thu Feb 17 19:05:33 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
-	* tests/IDL_Test/nested_scope.idl:
-	  New file.
+        * tests/IDL_Test/nested_scope.idl:
+          New file.
 
-	* tests/IDL_Test/idl_test.dsp:
-	* tests/IDL_Test/Makefile:
-	* tests/IDL_Test/reopened_modules.idl:
-	  Removed new example from reopened_modules.idl and added 
-	  the example plus many similar ones for various data types 
-	  to new file nested_scope.idl.
+        * tests/IDL_Test/idl_test.dsp:
+        * tests/IDL_Test/Makefile:
+        * tests/IDL_Test/reopened_modules.idl:
+          Removed new example from reopened_modules.idl and added
+          the example plus many similar ones for various data types
+          to new file nested_scope.idl.
 
 Thu Feb 17 18:39:36 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
-	* TAO_IDL/be/be_interface.cpp:
-	* TAO_IDL/be/be_structure.cpp:
-	* TAO_IDL/be/be_union.cpp:
-	* TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
-	* TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-	* TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp:
-	* TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp:
-	* TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp:
-	* TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp:
-	* TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp:
-	* TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp:
-	* TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp:
-	* TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_ci.cpp:
-	* TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_cs.cpp:
-	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:
-	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:
-	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:
-	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:
-	  More changes necessary to handle the skipped nested scope/repeated 
-	  name example added to IDL_Tests recently. These changes will deal 
-	  with all the types at the innermost scope that were causing a 
-	  problem. Also (see ACE ChangeLog) was able to get rid of the 
-	  ACE_GLOBAL_COLONS macro that was recently added to deal with
-	  SunCC 5.0.
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_structure.cpp:
+        * TAO_IDL/be/be_union.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:
+          More changes necessary to handle the skipped nested scope/repeated
+          name example added to IDL_Tests recently. These changes will deal
+          with all the types at the innermost scope that were causing a
+          problem. Also (see ACE ChangeLog) was able to get rid of the
+          ACE_GLOBAL_COLONS macro that was recently added to deal with
+          SunCC 5.0.
 
 Thu Feb 17 18:12:21 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* docs/interceptors.html: Updated the links for the latest
-	  Portable Interceptors Joint Submission.
+        * docs/interceptors.html: Updated the links for the latest
+          Portable Interceptors Joint Submission.
 
 Thu Feb 17 15:32:25 2000  Darrell Brunsch <brunsch@uci.edu>
 
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index 704c1665aa8..2d8c8ef2407 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -657,10 +657,10 @@ cat_profile_helper (TAO_InputCDR& stream,
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              "IIOP Version:\t%d.%d\n",
+              "%s Version:\t%d.%d\n",
+              protocol,
               iiop_version_major,
-              iiop_version_minor,
-              protocol));
+              iiop_version_minor));
 
   // Get host and port.
   CORBA::UShort port_number;