diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-08-09 19:00:08 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-08-09 19:00:08 +0200 |
| commit | a98a116dfafc65f58eb0d64b1c1bdbf72a46a048 (patch) | |
| tree | fde38dc7451bedaa7476c24ffb2ad062aff247a4 | |
| parent | 1194c8bf488a01fa6023c78c78e6470741f97cdc (diff) | |
| download | ATCD-a98a116dfafc65f58eb0d64b1c1bdbf72a46a048.tar.gz | |
Remove TAO_EXPORT_MACRO usage
* TAO/TAO_IDL/be/be_codegen.cpp:
* TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
* TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp:
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 7 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 0903df6bbc4..6755c9f7b80 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -535,13 +535,6 @@ TAO_CodeGen::start_server_header (const char *fname) *this->server_header_ << "\n\n#include /**/ \"" << be_global->skel_export_include () << "\""; - - // Generate the TAO_EXPORT_MACRO macro. - *this->server_header_ << "\n\n#if defined (TAO_EXPORT_MACRO)\n"; - *this->server_header_ << "#undef TAO_EXPORT_MACRO\n"; - *this->server_header_ << "#endif\n"; - *this->server_header_ << "#define TAO_EXPORT_MACRO " - << be_global->skel_export_macro (); } } else diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp index 99cde513542..a8100df3ba0 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp @@ -80,7 +80,7 @@ be_visitor_constant_ch::visit_constant (be_constant *node) } else if (!be_global->gen_inline_constants ()) { - *os << "extern TAO_EXPORT_MACRO "; + *os << "extern " << be_global->stub_export_macro () << " "; } *os << "const "; diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp index 8167ab81d97..44adb8fb6c7 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp @@ -253,9 +253,9 @@ be_visitor_root_ch::gen_static_corba_overrides (void) idl_global->mixed_parentage_interfaces ().dequeue_head (i); *o_ << be_nl - << "extern TAO_EXPORT_MACRO void release (" + << "extern " << be_global->stub_export_macro () << " void release (" << i->name () << "_ptr);" << be_nl - << "extern TAO_EXPORT_MACRO ::CORBA::Boolean is_nil (" + << "extern " << be_global->stub_export_macro () << " ::CORBA::Boolean is_nil (" << i->name () << "_ptr);"; } |