Generate stub export macro directly instead of TAO_EXPORT_MACRO, simplifies the code we generate

    * TAO/TAO_IDL/be/be_codegen.cpp:
    * TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp:
    * TAO/tao/AnyTypeCode/AnyTypeCode_methods.h:
    * TAO/tao/AnyTypeCode/TypeCode.h:
    * TAO/tao/AnyTypeCode/WrongTransactionA.h:
    * TAO/tao/CORBA_methods.h:
    * TAO/tao/DynamicInterface/Context.h:
    * TAO/tao/DynamicInterface/DII_CORBA_methods.h:
    * TAO/tao/DynamicInterface/ExceptionList.h:
    * TAO/tao/DynamicInterface/Request.h:
    * TAO/tao/DynamicInterface/Server_Request.h:
    * TAO/tao/DynamicInterface/Unknown_User_Exception.h:
    * TAO/tao/Object_KeyC.h:
    * TAO/tao/PI/PolicyFactoryC.h:
    * TAO/tao/PI_Server/ServerRequestInterceptorC.h:
    * TAO/tao/PortableServer/PS_ForwardC.h:
    * TAO/tao/PortableServer/PortableServer_Functions.h:
    * TAO/tao/PortableServer/PortableServer_WFunctions.h:
    * TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h:
    * TAO/tao/Typecode_typesC.h:
    * TAO/tao/Valuetype/AbstractBase.h:
    * TAO/tao/Valuetype/ValueBase.h:
    * TAO/tao/Valuetype/Value_CORBA_methods.h:
    * TAO/tao/WrongTransactionC.h:

1 files changed, 14 insertions, 11 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
index a1fc18b63f6..1f7cb2b3312 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -249,7 +249,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
 
   // The _alloc, _dup, copy, and free methods. If the node is nested, the
   // methods become static
-  const char *storage_class = 0;
+  ACE_CString storage_class;
 
   if (node->is_nested ())
     {
@@ -259,28 +259,31 @@ int be_visitor_array_ch::visit_array (be_array *node)
         }
       else
         {
-          storage_class = "extern TAO_EXPORT_MACRO ";
+          storage_class = "extern ";
+          storage_class = storage_class + be_global->stub_export_macro ();
+          storage_class = storage_class + " ";
         }
     }
   else
     {
-      storage_class = "TAO_EXPORT_MACRO ";
+      storage_class = be_global->stub_export_macro ();
+      storage_class = storage_class + " ";
     }
 
   if (td != 0)
     {
       // Typedefed array.
-      *os << storage_class << node->nested_type_name (scope, "_slice")
+      *os << storage_class.c_str() << node->nested_type_name (scope, "_slice")
           << " *" << be_nl;
       *os << node->nested_type_name (scope, "_alloc") << " (void);"
           << be_nl_2;
-      *os << storage_class << "void" << be_nl
+      *os << storage_class.c_str() << "void" << be_nl
           << node->nested_type_name (scope, "_free")
           << " (" << be_idt << be_idt_nl;
       *os << node->nested_type_name (scope, "_slice")
           << " *_tao_slice);" << be_uidt
           << be_uidt_nl << be_nl;
-      *os << storage_class << node->nested_type_name (scope, "_slice")
+      *os << storage_class.c_str() << node->nested_type_name (scope, "_slice")
           << " *" << be_nl;
       *os << node->nested_type_name (scope, "_dup")
           << " (" << be_idt << be_idt_nl
@@ -288,7 +291,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
       *os << node->nested_type_name (scope, "_slice")
           << " *_tao_slice);" << be_uidt
           << be_uidt_nl << be_nl;
-      *os << storage_class << "void" << be_nl
+      *os << storage_class.c_str() << "void" << be_nl
           << node->nested_type_name (scope, "_copy")
           << " (" << be_idt << be_idt_nl;
       *os << node->nested_type_name (scope, "_slice") << " *_tao_to," << be_nl
@@ -300,17 +303,17 @@ int be_visitor_array_ch::visit_array (be_array *node)
   else
     {
       // Anonymous array.
-      *os << storage_class << node->nested_type_name (scope, "_slice", "_")
+      *os << storage_class.c_str() << node->nested_type_name (scope, "_slice", "_")
           << " *" << be_nl;
       *os << node->nested_type_name (scope, "_alloc", "_")
           << " (void);" << be_nl_2;
-      *os << storage_class << "void" << be_nl
+      *os << storage_class.c_str() << "void" << be_nl
           << node->nested_type_name (scope, "_free", "_")
           << " (" << be_idt << be_idt_nl;
       *os << node->nested_type_name (scope, "_slice", "_")
           << " *_tao_slice);" << be_uidt
           << be_uidt_nl << be_nl;
-      *os << storage_class << node->nested_type_name (scope, "_slice", "_")
+      *os << storage_class.c_str() << node->nested_type_name (scope, "_slice", "_")
           << " *" << be_nl;
       *os << node->nested_type_name (scope, "_dup", "_")
           << " (" << be_idt << be_idt_nl
@@ -318,7 +321,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
       *os << node->nested_type_name (scope, "_slice", "_")
           << " *_tao_slice);" << be_uidt
           << be_uidt_nl << be_nl;
-      *os << storage_class << "void" << be_nl
+      *os << storage_class.c_str() << "void" << be_nl
           << node->nested_type_name (scope, "_copy", "_")
           << " (" << be_idt << be_idt_nl;
       *os << node->nested_type_name (scope, "_slice", "_")