ChangeLogTag:Thu Feb 2 13:08:31 Pacific Standard Time 2006 <ossama@dre.vanderbilt.edu>

5 files changed, 32 insertions, 0 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index db38d4d1331..f4cfb7941eb 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Thu Feb  2 13:08:31 Pacific Standard Time 2006    <ossama@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
+
+          Added ability to set "versioned" namespace opening and closing
+          text.  Addresses problem where applications that do not enable
+          versioned namespace support in their own code need not get
+          "versioned" stubs/skeletons.  This was previously done for all
+          other IDL types.  Valuetypes were overlooked.
+
 Thu Feb  2 12:20:16 Pacific Standard Time 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
         * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
index 85a3231b538..4d3b75db1e8 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
@@ -95,6 +95,8 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
       *os << "#else\n\n";
     }
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << " *); // copying" << be_nl;
 
@@ -104,6 +106,8 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   if (module != 0)
     {
       *os << "\n\n#endif";
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
index 53d1bc7234d..3bd1e867447 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
@@ -56,6 +56,8 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   // All template specializations must be generated before the instantiations
   // in the operators.
   *os << be_nl << be_nl
@@ -74,6 +76,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "}" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
+  *os << be_global->core_versioning_end () << be_nl;
 
   be_module *module = 0;
  
@@ -147,6 +150,8 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       *os << "#else\n";
     }
 
+  *os << be_global->core_versioning_begin () << be_nl;
+
   *os << "// Copying insertion." << be_nl
       << "void" << be_nl
       << "operator<<= (" << be_idt << be_idt_nl
@@ -190,6 +195,8 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   if (module != 0)
     {
       *os << "\n\n#endif";
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
index 2ee76042dcb..df4f4fa224f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
@@ -60,6 +60,8 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
       << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  *os << be_global->core_versioning_begin () << be_nl;
+  
   *os << be_global->stub_export_macro () << " "
       << "::CORBA::Boolean operator<< (TAO_OutputCDR &, const "
       << node->full_name () << " *);" << be_nl;
@@ -68,6 +70,8 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
       << "::CORBA::Boolean operator>> (TAO_InputCDR &, "
       << node->full_name () << " *&);";
 
+  *os << be_global->core_versioning_end () << be_nl;
+  
   // Set the substate as generating code for the types defined in our scope.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
index 35084bec6c4..27f2d4cb463 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
@@ -72,6 +72,8 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << 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);
 
@@ -104,6 +106,8 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
       << be_uidt_nl
       << "}" << be_nl << be_nl;
 
+  *os << be_global->core_versioning_end () << be_nl;
+
   if (!node->is_abstract ())
     {
       // Functions that marshal state.