ChangeLogTag: Fri Apr 21 07:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 34 insertions, 25 deletions

diff --git a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
index 9858d39a3c5..03d3e99cc87 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
@@ -187,14 +187,14 @@ void PC_Updater::clear_list ()
       const char* name;
       const char* ext;
 
-      name = ACE_OS::strstr (str, iad.location[0].in ());
+      name = ACE_OS::strstr (str, iad.location[0]);
 
       if (name)
       {
         ext = ACE_OS::strstr (name, ".");
 
         ACE_CString loc (this->server_path_);
-        loc += iad.location[0].in ();
+        loc += iad.location[0];
         loc += ext;
 
         iad.location[0] = CORBA::string_dup (loc.c_str ());
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bd5b99d5a71..8bd966262fc 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 21 08:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Trading/TTest.idl:
+          Use the CORBA predefined sequence types
+
 Fri Apr 21 07:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
index c09ed666805..7f580e93811 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_interface, 
-           cdr_op_ch, 
+ACE_RCSID (be_visitor_interface,
+           cdr_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -42,7 +42,7 @@ int
 be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
 {
   // No CDR operations for locality constraint interfaces.
-  if (node->cli_hdr_cdr_op_gen () 
+  if (node->cli_hdr_cdr_op_gen ()
       || node->imported ()
       || node->is_local ())
     {
@@ -52,7 +52,7 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -62,7 +62,7 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
       << "_ptr );" << be_nl;
   *os << be_global->stub_export_macro () << " ::CORBA::Boolean "
       << "operator>> (TAO_InputCDR &, "
-      << node->full_name () << "_ptr &);";
+      << node->full_name () << "_ptr &);" << be_nl;
 
   *os << be_global->core_versioning_end () << be_nl;
 
@@ -74,7 +74,7 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface_cdr_op_ch::"
                          "visit_interface - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index 369273c817e..468e5c56e06 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
@@ -60,10 +60,10 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
     }
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
 
@@ -139,8 +139,8 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
       << "_Factory_function_pointer" << be_uidt_nl
       << ");" << be_uidt_nl << be_uidt_nl;
 
-  *os << "return 1;" << be_uidt_nl
-      << "}";
+  *os << "return true;" << be_uidt_nl
+      << "}" << be_nl;
 
   *os << be_global->core_versioning_end () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index f027876c940..2b45fca1bbe 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -93,12 +93,12 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
     }
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-    << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+    << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
   *os << "#if !defined _TAO_CDR_OP_"
       << node->flat_name () << "_CPP_" << be_nl
       << "#define _TAO_CDR_OP_" << node->flat_name () << "_CPP_"
-      << be_nl << be_nl;
+      << be_nl;
 
   *os << be_global->core_versioning_begin () << be_nl;
 
@@ -135,6 +135,8 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
 
   *os << "}";
 
+  *os << be_nl << be_global->core_versioning_end ();
+
   *os << be_nl
       << "#endif /* _TAO_CDR_OP_"
       << node->flat_name () << "_CPP_ */";
diff --git a/TAO/orbsvcs/tests/Trading/TTest.idl b/TAO/orbsvcs/tests/Trading/TTest.idl
index 96adc9c093e..756f057e266 100644
--- a/TAO/orbsvcs/tests/Trading/TTest.idl
+++ b/TAO/orbsvcs/tests/Trading/TTest.idl
@@ -1,12 +1,14 @@
 // $Id$
 
+#include <orb.idl>
+
 module TAO_Trader_Test
 {
-  
+
 interface Remote_Output
 {
   void confirm ();
-  // Ensure that the object reference returned from the query actually 
+  // Ensure that the object reference returned from the query actually
   // works.
 };
 
@@ -26,15 +28,15 @@ interface PostScript_Printer : Remote_Output
 {
 };
 
-// Sequences used to test sequence type equivalence in the trader. 
-typedef sequence<short> ShortSeq;
-typedef sequence<unsigned short> UShortSeq;
-typedef sequence<long> LongSeq;
-typedef sequence<unsigned long> ULongSeq;
-typedef sequence<boolean> BooleanSeq;
-typedef sequence<float> FloatSeq;
-typedef sequence<double> DoubleSeq;
-typedef sequence<string> StringSeq;
+// Sequences used to test sequence type equivalence in the trader.
+typedef CORBA::ShortSeq ShortSeq;
+typedef CORBA::UShortSeq UShortSeq;
+typedef CORBA::LongSeq LongSeq;
+typedef CORBA::ULongSeq ULongSeq;
+typedef CORBA::BooleanSeq BooleanSeq;
+typedef CORBA::FloatSeq FloatSeq;
+typedef CORBA::DoubleSeq DoubleSeq;
+typedef CORBA::StringSeq StringSeq;
 
 };