diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2006-02-07 21:09:06 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2006-02-07 21:09:06 +0000 |
| commit | ad4da72989b19c6b57c74fb5ec8606af8c69b353 (patch) | |
| tree | 499a5588b2d273fc6f692ff43eb6f288c473e45c | |
| parent | 57825fb32f72d10de62aabc1656b048b5ef76984 (diff) | |
| download | ATCD-ad4da72989b19c6b57c74fb5ec8606af8c69b353.tar.gz | |
Tue Feb 7 21:07:35 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp | 4 | ||||
| -rw-r--r-- | TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h | 2 | ||||
| -rw-r--r-- | TAO/tests/NestedUpcall/MT_Client_Test/local_server.h | 2 |
4 files changed, 20 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 96366f472a8..46f3520be05 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Tue Feb 7 21:07:35 UTC 2006 William Otte <wotte@dre.vanderbilt.edu> + + * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp + + Surrounded valuetype CDR operators with versioned namespace + macros. + + * performance-tests/Cubit/TAO/MT_Cubit/Globals.h + * tests/NestedUpcall/MT_Client_Test/local_server.h + + Surrounded forward declarations of ACE/TAO types with versioned + namespace macros. + Mon Feb 6 16:46:57 Pacific Standard Time 2006 Ossama Othman <ossama_othman at symantec dot com> * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp index 2280f0d5444..eba33c1a755 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp @@ -78,6 +78,8 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd ( *os << "// 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; @@ -85,6 +87,8 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd ( *os << be_global->stub_export_macro () << " ::CORBA::Boolean operator>> (TAO_InputCDR &, " << node->full_name () << " *&);" << be_nl; + + *os << be_global->core_versioning_end () << be_nl; node->cli_hdr_cdr_op_gen (I_TRUE); bfd->cli_hdr_cdr_op_gen (I_TRUE); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h index cfc4b638fee..171458e98d7 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h @@ -104,7 +104,9 @@ argv = force_argv; // A constant to avoid the utility thread blocking the machine and to // bound its number of computations. +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Barrier; +ACE_END_VERSIONED_NAMESPACE_DECL class Globals { diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h index 4a07a9381bb..01c4d33b760 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h @@ -33,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Manager; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_END_VERSIONED_NAMESPACE_DECL class MT_Server { |