diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-02-06 20:57:33 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-02-06 20:57:33 +0000 |
commit | 8e7f405ab6bceab06dfcdfbe386a9117cd83798d (patch) | |
tree | 21404649cdb75974e0f24aa47cce373e953b320d | |
parent | 2937ca2b236b5e0269e238de0b8d0728b16ca587 (diff) | |
download | ATCD-8e7f405ab6bceab06dfcdfbe386a9117cd83798d.tar.gz |
ChangeLogTag:Mon Feb 6 16:46:57 Pacific Standard Time 2006 Ossama Othman <ossama_othman at symantec dot com>
-rw-r--r-- | TAO/ChangeLog | 28 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp | 4 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp | 4 | ||||
-rw-r--r-- | TAO/tests/MT_BiDir/Sender_i.h | 4 | ||||
-rw-r--r-- | TAO/tests/MT_BiDir/Server_Task.h | 3 | ||||
-rw-r--r-- | TAO/tests/NestedUpcall/MT_Client_Test/local_server.h | 2 | ||||
-rw-r--r-- | TAO/tests/OBV/Collocated/Forward/Server_Task.h | 2 | ||||
-rw-r--r-- | TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h | 2 | ||||
-rw-r--r-- | TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h | 2 | ||||
-rw-r--r-- | TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h | 2 | ||||
-rw-r--r-- | TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h | 2 | ||||
-rw-r--r-- | TAO/tests/Two_Objects/First_i.cpp | 3 | ||||
-rw-r--r-- | TAO/tests/Two_Objects/First_i.h | 7 | ||||
-rw-r--r-- | TAO/tests/Two_Objects/Object_Factory_i.h | 5 | ||||
-rw-r--r-- | TAO/tests/Two_Objects/Second_i.h | 4 |
15 files changed, 67 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b38df3d4790..96366f472a8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,31 @@ +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: + * TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.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. Forward interface declarations were + overlooked. + + * tests/MT_BiDir/Sender_i.h: + * tests/MT_BiDir/Server_Task.h: + * tests/NestedUpcall/MT_Client_Test/local_server.h: + * tests/OBV/Collocated/Forward/Server_Task.h: + * tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h: + * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server.h: + * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h: + * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h: + * tests/Two_Objects/First_i.cpp: + * tests/Two_Objects/First_i.h: + * tests/Two_Objects/Object_Factory_i.h: + * tests/Two_Objects/Second_i.h: + + Placed forward declarations for ACE/TAO types in the appropriate + versioned namespace. + Fri Feb 3 15:16:41 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> * tests/Bug_1495_Regression/Server_Task.h: diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp index 471b498584b..75cf81f5be5 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp @@ -101,6 +101,8 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (be_interface_fwd *node) *os << "#else\n\n"; } + *os << be_global->core_versioning_begin () << be_nl; + *os << macro << " void" << " operator<<= (::CORBA::Any &, " << node->name () << "_ptr); // copying" << be_nl; @@ -111,6 +113,8 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (be_interface_fwd *node) << " 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_interface_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp index cbf5ebac938..325ba44622c 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp @@ -65,6 +65,8 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *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; + *os << be_global->stub_export_macro () << " ::CORBA::Boolean " << "operator<< (TAO_OutputCDR &, const " << node->full_name () << "_ptr );" << be_nl; @@ -72,6 +74,8 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node) << "operator>> (TAO_InputCDR &, " << node->full_name () << "_ptr &);\n"; + *os << be_global->core_versioning_end () << be_nl; + node->cli_hdr_cdr_op_gen (1); return 0; } diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h index cda5d4bf54e..91b4b729db0 100644 --- a/TAO/tests/MT_BiDir/Sender_i.h +++ b/TAO/tests/MT_BiDir/Sender_i.h @@ -1,6 +1,6 @@ +// -*- C++ -*- // // $Id$ -// #ifndef MT_BIDIR_RECEIVER_H #define MT_BIDIR_RECEIVER_H @@ -8,7 +8,9 @@ #include "SenderS.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Manual_Event; +ACE_END_VERSIONED_NAMESPACE_DECL /** * Simply print count how many bytes were received. diff --git a/TAO/tests/MT_BiDir/Server_Task.h b/TAO/tests/MT_BiDir/Server_Task.h index 20d4142c2dd..42686741b21 100644 --- a/TAO/tests/MT_BiDir/Server_Task.h +++ b/TAO/tests/MT_BiDir/Server_Task.h @@ -16,7 +16,10 @@ #include "tao/ORB.h" class Sender_i; + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Manual_Event; +ACE_END_VERSIONED_NAMESPACE_DECL /// Implement a Task to run the experiments using multiple threads. class Server_Task : public ACE_Task_Base diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h index 7596cb1be20..4a07a9381bb 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h @@ -31,7 +31,9 @@ #include "ace/Task.h" #include "ace/Log_Msg.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Manager; +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class MT_Server { diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.h b/TAO/tests/OBV/Collocated/Forward/Server_Task.h index 4f2307adc30..60006aae0ba 100644 --- a/TAO/tests/OBV/Collocated/Forward/Server_Task.h +++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.h @@ -15,7 +15,9 @@ #include "tao/ORB.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Manual_Event; +ACE_END_VERSIONED_NAMESPACE_DECL /// Implement a Task to run the server in a single thread class Server_Task : public ACE_Task_Base diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h index 7bac19ca641..2101f9a9a15 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h @@ -15,7 +15,9 @@ #include "ace/Task.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Manual_Event; +ACE_END_VERSIONED_NAMESPACE_DECL /// Implement a Task to run the server in a single thread class Server_Task : public ACE_Task_Base diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h index 2d0c8fbdb2b..e048b0f737d 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h @@ -13,7 +13,9 @@ #include "tao/ORB.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Manual_Event; +ACE_END_VERSIONED_NAMESPACE_DECL /// Implement a Task to run the server in a single thread class Server_Task : public ACE_Task_Base diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h index fe7e6b073d7..2f63a0724de 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h @@ -15,7 +15,9 @@ #include "tao/ORB.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Manual_Event; +ACE_END_VERSIONED_NAMESPACE_DECL /// Implement a Task to run the server in a single thread class Server_Task : public ACE_Task_Base diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h index 5420647d490..6b7b9404bd5 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h @@ -15,7 +15,9 @@ #include "tao/ORB.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Manual_Event; +ACE_END_VERSIONED_NAMESPACE_DECL /// Implement a Task to run the server in a single thread class Server_Task : public ACE_Task_Base diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp index 6e0c6e2c465..b275e55e0be 100644 --- a/TAO/tests/Two_Objects/First_i.cpp +++ b/TAO/tests/Two_Objects/First_i.cpp @@ -7,8 +7,9 @@ #include "tao/debug.h" #include "tao/Transport_Cache_Manager.h" #include "ace/Synch.h" +#include "ace/Auto_Event.h" -ACE_RCSID(Test, Test, "$Id$") +ACE_RCSID(Test, First_i, "$Id$") First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h index 9273bf283cb..6fa70f53749 100644 --- a/TAO/tests/Two_Objects/First_i.h +++ b/TAO/tests/Two_Objects/First_i.h @@ -1,13 +1,16 @@ +// -*- C++ -*- // // $Id$ -// #ifndef TAO_TWO_OBJECTS_FIRST_I_H #define TAO_TWO_OBJECTS_FIRST_I_H #include "Two_ObjectsS.h" -#include "ace/Auto_Event.h" + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class ACE_Auto_Event; +ACE_END_VERSIONED_NAMESPACE_DECL /// Implement the Two_Objects_Test::First interface class First_i diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h index 2eab1c9966f..fbfd2ef094c 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.h +++ b/TAO/tests/Two_Objects/Object_Factory_i.h @@ -1,6 +1,6 @@ +// -*- C++ -*- // // $Id$ -// #ifndef OBJECT_FACTORY_I_H #define OBJECT_FACTORY_I_H @@ -9,7 +9,8 @@ #include "First_i.h" #include "Second_i.h" -class ACE_Event; +#include "ace/Auto_Event.h" + /// Implement the MTServer::Test interface class Object_Factory_i diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h index 30a6f0d2e09..aa0375c9b2f 100644 --- a/TAO/tests/Two_Objects/Second_i.h +++ b/TAO/tests/Two_Objects/Second_i.h @@ -1,13 +1,15 @@ +// -*- C++ -*- // // $Id$ -// #ifndef TAO_TWO_OBJECTS_SECOND_I_H #define TAO_TWO_OBEJCTS_SECOND_I_H #include "Two_ObjectsS.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Auto_Event; +ACE_END_VERSIONED_NAMESPACE_DECL /// Implement the POA_Two_Objects_Test::Second interface class Second_i |