*** empty log message ***

7 files changed, 13 insertions, 7 deletions

diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 609369bba6b..063de29dc5a 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1424,6 +1424,12 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
       this->client_header_
     );
 
+  this->gen_cond_file_include (
+      idl_global->any_seen_
+      | idl_global->typecode_seen_,
+      "tao/TypeCode_Constants.h",
+      this->client_header_);
+
   // This is true if we have an 'any' in the IDL file.
   // If not included here, it will appear in *C.cpp, if Anys not suppressed.
   this->gen_cond_file_include (
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
index 492dced517a..e6c3ecb3016 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp
@@ -45,7 +45,7 @@ TAO::be_visitor_alias_typecode::visit_typedef (be_typedef * node)
   // Generate the alias TypeCode instantiation.
   os
     << "static TAO::TypeCode::Alias<char const *," << be_nl
-    << "                            TAO::Null_RefCount_Policy> const"
+    << "                            TAO::Null_RefCount_Policy>"
     << be_idt_nl
     << "_tao_tc_" << node->flat_name () << " (" << be_idt_nl
     << "\"" << node->repoID () << "\"," << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
index a87e2f40d34..efec4e5fa9f 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/enum_typecode.cpp
@@ -53,7 +53,7 @@ TAO::be_visitor_enum_typecode::visit_enum (be_enum * node)
   os
     << "static TAO::TypeCode::Enum<char const *," << be_nl
     << "                           TAO::TypeCode::Enumerator<char const *> const *," << be_nl
-    << "                           TAO::Null_RefCount_Policy> const"
+    << "                           TAO::Null_RefCount_Policy>"
     << be_idt_nl
     << "_tao_tc_" << node->flat_name () << " (" << be_idt_nl
     << "\"" << node->repoID () << "\"," << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
index 09cb4bb31ae..4664485f982 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp
@@ -76,7 +76,7 @@ TAO::be_visitor_objref_typecode::visit_i (char const * kind,
   os
     << "static TAO::TypeCode::Objref<char const *," << be_nl
     << "                             CORBA::tk_" << kind << "," << be_nl
-    << "                             TAO::Null_RefCount_Policy> const"
+    << "                             TAO::Null_RefCount_Policy>"
     << be_idt_nl
     << "_tao_tc_" << flat_name << " (" << be_idt_nl
     << "\"" << repository_id << "\"," << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
index 99981b763b0..87da74c4b47 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp
@@ -55,7 +55,7 @@ TAO::be_visitor_struct_typecode::visit_structure (AST_Structure * node)
     << "                             TAO::TypeCode::Struct_Field<char const *> const *," << be_nl
     << "                             CORBA::tk_"
     << (this->is_exception_ ? "except" : "struct") << "," << be_nl
-    << "                             TAO::Null_RefCount_Policy> const"
+    << "                             TAO::Null_RefCount_Policy>"
     << be_idt_nl
     << "_tao_tc_" << node->flat_name () << " (" << be_idt_nl
     << "\"" << node->repoID () << "\"," << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index 988ce15738e..dca2730b9b5 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -756,7 +756,7 @@ be_visitor_typecode_defn::visit_sequence (be_sequence * node)
     }
 
   // Generate the TypeCode instantiation.
-  os << "static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy> const"
+  os << "static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>"
      << be_idt_nl
      << "_tao_tc_"
 //      << node->flat_name () << "_" << node->max_size()
@@ -793,7 +793,7 @@ be_visitor_typecode_defn::visit_string (be_string * node)
 
   // Generate the TypeCode instantiation.
   os
-    << "static TAO::TypeCode::String<TAO::Null_RefCount_Policy> const"
+    << "static TAO::TypeCode::String<TAO::Null_RefCount_Policy>"
     << be_idt_nl
     << "_tao_tc_" << node->flat_name () << " (" << be_idt_nl
     << "CORBA::tk_" << (node->width () == 1 ? "string" : "wstring") << ","
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
index eecc25f598a..39a56a07cac 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
@@ -73,7 +73,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
                                      + node->flat_name ());
 
       // Generate array containing struct field characteristics.
-      os << "static TAO::TypeCode::Value_Field<char const *> const "
+      os << "static TAO::TypeCode::Value_Field<char const *> "
          << fields_name.c_str ();
 
       if (count == 0)