diff options
38 files changed, 73 insertions, 151 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f382fb792ef..76f62e73893 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,44 @@ +Thu Oct 28 07:41:02 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/RTScheduling/DT_Creator.h: + * examples/RTScheduling/Fixed_Priority_Scheduler/test.h: + * examples/RTScheduling/MIF_Scheduler/test.h: + * orbsvcs/examples/ImR/Advanced/TestServer.h: + * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h: + * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h: + * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl: + * orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h: + * orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp: + * orbsvcs/performance-tests/RTEvent/lib/Send_Task.h: + * orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp: + * performance-tests/POA/Demux/demux_test_server.h: + * tao/Array_Traits_T.h: + * tao/Object_Reference_Traits_T.h: + * tao/PortableServer/Servant_var.h: + * tao/String_Traits_T.h: + * tao/Value_Traits_T.h: + * tao/Valuetype/Valuetype_Traits_T.h: + * tests/Bug_1020_Basic_Regression/client.cpp: + * tests/Bug_1020_Basic_Regression/server.cpp: + * tests/Bug_1020_Regression/client.cpp: + * tests/Bug_1020_Regression/server.cpp: + * tests/Bug_1269_Regression/client.cpp: + * tests/Bug_1269_Regression/server.cpp: + * tests/Bug_1270_Regression/client.cpp: + * tests/Bug_1270_Regression/server.cpp: + * tests/Bug_1361_Regression/client.cpp: + * tests/Bug_1361_Regression/server.cpp: + * tests/Bug_1535_Regression/bug_1535_regression.cpp: + * tests/Bug_1551_Regression/Client_Task.h: + * tests/Bug_1551_Regression/server.cpp: + * tests/Bug_1568_Regression/server.cpp: + * tests/Bug_1670_Regression/server.cpp: + * tests/Bug_2503_Regression/test_i.cpp: + * tests/Bug_2560_Regression/Stock_Factory_i.cpp: + * tests/Bug_3647_Regression/backend_server.cpp: + * tests/Bug_3647_Regression/middle_server.cpp: + Fixed compile errors, removed gcc < 3 support + Wed Oct 27 17:45:45 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * docs/idltocpp0x/IDLC++0xRFP.odt: diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h index 3a79f51966d..bc5b01d60c4 100644 --- a/TAO/examples/RTScheduling/DT_Creator.h +++ b/TAO/examples/RTScheduling/DT_Creator.h @@ -10,7 +10,6 @@ #include "tao/RTScheduling/RTScheduler.h" #include "orbsvcs/CosNamingC.h" -#include "tao/Utils/Servant_Var.h" #include "ace/Service_Config.h" #include "ace/Service_Object.h" @@ -106,7 +105,7 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object ACE_TString file_name_; ACE_TString log_file_name_; ACE_UINT32 gsf_; - TAO::Utils::Servant_Var<Synch_i> synch_; + PortableServer::Servant_var<Synch_i> synch_; }; diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h index 565adffb08a..aa7ff8dfb65 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h @@ -10,7 +10,6 @@ #include "ace/Synch.h" #include "ace/Task.h" #include "FP_DT_Creator.h" -#include "tao/Utils/Servant_Var.h" class Task_Stats; @@ -53,7 +52,7 @@ class DT_Test :public ACE_Task <ACE_SYNCH> int min_priority_; RTScheduling::Current_var current_; FP_DT_Creator* dt_creator_; - TAO::Utils::Servant_Var<Fixed_Priority_Scheduler> scheduler_; + PortableServer::Servant_var<Fixed_Priority_Scheduler> scheduler_; RTCORBA::RTORB_var rt_orb_; /// Reference to the root poa. PortableServer::POA_var root_poa_; diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.h b/TAO/examples/RTScheduling/MIF_Scheduler/test.h index fa3e8eec8ae..acb1f249fe8 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.h @@ -9,7 +9,6 @@ #include "tao/ORB_Core.h" #include "ace/Synch.h" #include "ace/Task.h" -#include "tao/Utils/Servant_Var.h" class Task_Stats; @@ -45,7 +44,7 @@ class DT_Test //:public ACE_Task <ACE_SYNCH> int min_priority_; RTScheduling::Current_var current_; MIF_DT_Creator* dt_creator_; - TAO::Utils::Servant_Var<MIF_Scheduler> scheduler_; + PortableServer::Servant_var<MIF_Scheduler> scheduler_; }; typedef ACE_Singleton <DT_Test, TAO_SYNCH_MUTEX> DT_TEST; diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h index 6a2bfba43b1..e655a120dc9 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h @@ -4,7 +4,6 @@ #include "ace/Auto_Ptr.h" #include "tao/IORTable/IORTable.h" -#include "tao/Utils/Servant_Var.h" #include <string> #include <vector> diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 20118e46426..1ff0410b42a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -140,7 +140,7 @@ public: /// Connect or reconnect to the EC with the given subscriptions. /** - * NOTE: if we are already connected to EC and a reconnection is + * @note if we are already connected to EC and a reconnection is * necessary, the EC must have reconnects enabled in order for this * method to succeed. */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h index 1755c5af6d0..3ddd3c845a9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h @@ -117,7 +117,6 @@ public: //! Assignment operator. Assumes ownership of \c p. TAO_EC_Servant_Var<T> & operator=(T * p); -# if !defined(ACE_LACKS_MEMBER_TEMPLATES) //! Template member constructor from a pointer that will implicitly //! cast to type T. Assumes ownership of \c p. //! This constructor allows constructs such as: @@ -139,7 +138,6 @@ public: //! can be implicitly cast to type T. template <class Y> TAO_EC_Servant_Var<T> & operator=(Y * p); -# endif /* ACE_LACKS_MEMBER_TEMPLATES */ //! Smart pointer operator-> provides access to the underlying object. T const * operator->() const; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl index 369c23300ec..5f9083577ae 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl @@ -194,7 +194,6 @@ ACE_INLINE TAO_EC_Servant_Var<T>:: } } -#if !defined(ACE_LACKS_MEMBER_TEMPLATES) template <class T> template <class Y> ACE_INLINE TAO_EC_Servant_Var<T>:: TAO_EC_Servant_Var(Y * p) @@ -240,7 +239,6 @@ operator=(Y * p) return *this; } -#endif /* ACE_LACKS_MEMBER_TEMPLATES */ template <class T> ACE_INLINE T const * TAO_EC_Servant_Var<T>:: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp index 20f6b7d5a07..49b85e70d32 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp @@ -17,7 +17,7 @@ Loopback_Consumer (CORBA::Long experiment_id, PortableServer::POA_ptr poa) : experiment_id_ (experiment_id) , event_type_ (event_type) - , supplier_ (TAO::Utils::Servant_Var<Loopback_Supplier>::_duplicate (supplier)) + , supplier_ (PortableServer::Servant_var<Loopback_Supplier>::_duplicate (supplier)) , default_POA_ (PortableServer::POA::_duplicate (poa)) { } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h index 4d7f1fd1ec9..5751b666e80 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h @@ -9,7 +9,6 @@ #define TAO_PERF_RTEC_LOOPBACK_CONSUMER_H #include "Loopback_Supplier.h" -#include "tao/Utils/Servant_Var.h" #include "orbsvcs/RtecEventCommS.h" #include "orbsvcs/RtecEventChannelAdminC.h" @@ -59,7 +58,7 @@ private: CORBA::Long event_type_; /// The supplier used to close the loopback - TAO::Utils::Servant_Var<Loopback_Supplier> supplier_; + PortableServer::Servant_var<Loopback_Supplier> supplier_; /// The proxy this object is connected to RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier_; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp index 2bccf6c5217..2c43bc84650 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp @@ -39,7 +39,7 @@ Send_Task::init (int iterations, this->event_type_ = event_type; this->event_source_ = event_source; this->supplier_ = - TAO::Utils::Servant_Var<Supplier>::_duplicate (supplier); + PortableServer::Servant_var<Supplier>::_duplicate (supplier); this->barrier_ = barrier; } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h index 0814173a275..289f94d4569 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h @@ -9,7 +9,6 @@ #ifndef TAO_PERF_RTEC_SEND_TASK_H #define TAO_PERF_RTEC_SEND_TASK_H -#include "tao/Utils/Servant_Var.h" #include "Supplier.h" #include "ace/Task.h" #include "ace/Synch_Traits.h" @@ -66,7 +65,7 @@ private: int event_source_; - TAO::Utils::Servant_Var<Supplier> supplier_; + PortableServer::Servant_var<Supplier> supplier_; ACE_Barrier *barrier_; diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h index 6ee675d57e8..020849892cf 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.h +++ b/TAO/performance-tests/POA/Demux/demux_test_server.h @@ -66,7 +66,7 @@ private: // the ORB PortableServer::POA_var root_poa_; - // the root POA (we will not have any objects registerd with this) + // the root POA (we will not have any objects registered with this) PortableServer::POAManager_var poa_mgr_; // The POA manager diff --git a/TAO/tao/Array_Traits_T.h b/TAO/tao/Array_Traits_T.h index 459e03c3405..4abd34b0383 100644 --- a/TAO/tao/Array_Traits_T.h +++ b/TAO/tao/Array_Traits_T.h @@ -70,7 +70,6 @@ struct array_traits begin, end, &TAO::Array_Traits<forany_type>::zero); } -# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_range( @@ -81,18 +80,7 @@ struct array_traits TAO::Array_Traits<forany_type>::copy(*dst, *i); } } -# else - inline static void copy_range( - value_type * begin, value_type * end, value_type *dst) - { - for(value_type * i = begin; i != end; ++i, ++dst) - { - TAO::Array_Traits<forany_type>::copy(*dst, *i); - } - } -# endif /* !ACE_LACKS_MEMBER_TEMPLATES */ -# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_swap_range( @@ -100,13 +88,6 @@ struct array_traits { copy_range(begin, end, dst); } -# else - inline static void copy_swap_range( - value_type * begin, value_type * end, value_type *dst) - { - copy_range(begin, end, dst); - } -# endif /* !ACE_LACKS_MEMBER_TEMPLATES */ }; } // namespace details diff --git a/TAO/tao/Object_Reference_Traits_T.h b/TAO/tao/Object_Reference_Traits_T.h index 2d490ef3442..08532daa8cd 100644 --- a/TAO/tao/Object_Reference_Traits_T.h +++ b/TAO/tao/Object_Reference_Traits_T.h @@ -43,7 +43,6 @@ struct object_reference_traits_decorator std::generate(begin, end, &derived::default_initializer); } -# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_range( @@ -51,15 +50,7 @@ struct object_reference_traits_decorator { std::transform(begin, end, dst, &derived::duplicate); } -# else - inline static void copy_range( - object_type ** begin, object_type ** end, object_type ** dst) - { - std::transform(begin, end, dst, &derived::duplicate); - } -# endif /* !ACE_LACKS_MEMBER_TEMPLATES */ -# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_swap_range( @@ -67,13 +58,6 @@ struct object_reference_traits_decorator { std::swap_ranges(begin, end, dst); } -# else - inline static void copy_swap_range( - object_type ** begin, object_type ** end, object_type ** dst) - { - std::swap_ranges(begin, end, dst); - } -# endif /* !ACE_LACKS_MEMBER_TEMPLATES */ inline static void release_range( object_type ** begin, object_type ** end) diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h index efc8b73c35e..75bd5a97fc6 100644 --- a/TAO/tao/PortableServer/Servant_var.h +++ b/TAO/tao/PortableServer/Servant_var.h @@ -115,13 +115,11 @@ namespace PortableServer /// Compare two Servant_vars for equivalence. template <class X, class Y> - bool operator==(Servant_var<X> const & x, - Servant_var<Y> const & y); + bool operator==(Servant_var<X> const & x, Servant_var<Y> const & y); /// Compare two Servant_vars for non-equivalence. template <class X, class Y> - bool operator!=(Servant_var<X> const & x, - Servant_var<Y> const & y); + bool operator!=(Servant_var<X> const & x, Servant_var<Y> const & y); } // namespace PortableServer diff --git a/TAO/tao/String_Traits_T.h b/TAO/tao/String_Traits_T.h index 3c5c6424ff8..ca1b05d990f 100644 --- a/TAO/tao/String_Traits_T.h +++ b/TAO/tao/String_Traits_T.h @@ -41,7 +41,6 @@ struct string_traits_decorator std::generate(begin, end, &derived::default_initializer); } -# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_range( @@ -49,15 +48,7 @@ struct string_traits_decorator { std::transform(begin, end, dst, &derived::duplicate); } -# else - inline static void copy_range( - char_type ** begin, char_type ** end, char_type ** dst) - { - std::transform(begin, end, dst, &derived::duplicate); - } -# endif /* !ACE_LACKS_MEMBER_TEMPLATES */ -# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_swap_range( @@ -65,13 +56,6 @@ struct string_traits_decorator { std::swap_ranges(begin, end, dst); } -# else - inline static void copy_swap_range( - char_type ** begin, char_type ** end, char_type ** dst) - { - std::swap_ranges(begin, end, dst); - } -# endif /* !ACE_LACKS_MEMBER_TEMPLATES */ inline static void release_range( char_type ** begin, char_type ** end) diff --git a/TAO/tao/Value_Traits_T.h b/TAO/tao/Value_Traits_T.h index b68acfd7b63..a36338f2b41 100644 --- a/TAO/tao/Value_Traits_T.h +++ b/TAO/tao/Value_Traits_T.h @@ -46,7 +46,6 @@ struct value_traits // Noop for value sequences } -# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_range( @@ -54,15 +53,7 @@ struct value_traits { std::copy(begin, end, dst); } -# else - inline static void copy_range( - value_type * begin, value_type * end, value_type * dst) - { - std::copy(begin, end, dst); - } -# endif /* !ACE_LACKS_MEMBER_TEMPLATES */ -# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_swap_range( @@ -70,13 +61,6 @@ struct value_traits { copy_range(begin, end, dst); } -# else - inline static void copy_swap_range( - value_type * begin, value_type * end, value_type * dst) - { - copy_range(begin, end, dst); - } -# endif /* !ACE_LACKS_MEMBER_TEMPLATES */ }; } // namespace details diff --git a/TAO/tao/Valuetype/Valuetype_Traits_T.h b/TAO/tao/Valuetype/Valuetype_Traits_T.h index 74b93e3065c..460ccc946ff 100644 --- a/TAO/tao/Valuetype/Valuetype_Traits_T.h +++ b/TAO/tao/Valuetype/Valuetype_Traits_T.h @@ -42,7 +42,6 @@ struct valuetype_traits_decorator std::generate(begin, end, &derived::default_initializer); } -# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_range( @@ -50,15 +49,7 @@ struct valuetype_traits_decorator { std::transform(begin, end, dst, &derived::duplicate); } -# else - inline static void copy_range( - object_type ** begin, object_type ** end, object_type ** dst) - { - std::transform(begin, end, dst, &derived::duplicate); - } -# endif /* ACE_LACKS_MEMBER_TEMPLATES */ -# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_swap_range( @@ -66,13 +57,6 @@ struct valuetype_traits_decorator { std::swap_ranges(begin, end, dst); } -# else - inline static void copy_swap_range( - object_type ** begin, object_type ** end, object_type ** dst) - { - std::swap_ranges(begin, end, dst); - } -# endif /* ACE_LACKS_MEMBER_TEMPLATES */ inline static void release_range( object_type ** begin, object_type ** end) diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp index 3b72afd8677..a681243525b 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp @@ -2,7 +2,6 @@ #include "Echo.h" #include "Client_Task.h" -#include "tao/Utils/Servant_Var.h" #include "ace/Get_Opt.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" @@ -87,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo> impl; + PortableServer::Servant_var<Echo> impl; { Echo * tmp; // ACE_NEW_RETURN is the worst possible way to handle diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp index 58bf0b6525d..5d2ccad9a2b 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/server.cpp @@ -2,7 +2,6 @@ #include "Echo_Caller.h" #include "tao/ORB_Core.h" -#include "tao/Utils/Servant_Var.h" #include "ace/Get_Opt.h" const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); @@ -59,7 +58,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo_Caller> impl; + PortableServer::Servant_var<Echo_Caller> impl; { Echo_Caller * tmp; // ACE_NEW_RETURN is the worst possible way to handle diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp index 2b594d35750..770c576efd9 100644 --- a/TAO/tests/Bug_1020_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Regression/client.cpp @@ -4,13 +4,10 @@ #include "ORB_Task.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" - - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -73,7 +70,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo> impl; + PortableServer::Servant_var<Echo> impl; { Echo * tmp = 0; // ACE_NEW_RETURN is the worst possible way to handle diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp index 01278ac4821..98c44f068bb 100644 --- a/TAO/tests/Bug_1020_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Regression/server.cpp @@ -3,7 +3,6 @@ #include "Server_i.h" #include "ORB_Task.h" #include "tao/Messaging/Messaging.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" @@ -49,7 +48,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Server> impl; + PortableServer::Servant_var<Server> impl; { Server * tmp; // ACE_NEW_RETURN is the worst possible way to handle diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp index 6ca63c69581..56ff66d4927 100644 --- a/TAO/tests/Bug_1269_Regression/client.cpp +++ b/TAO/tests/Bug_1269_Regression/client.cpp @@ -3,7 +3,6 @@ #include "Echo.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" @@ -61,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo> impl; + PortableServer::Servant_var<Echo> impl; { Echo * tmp; // ACE_NEW_RETURN is the worst possible way to handle diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp index e0283e8a837..01bf0aa1ebe 100644 --- a/TAO/tests/Bug_1269_Regression/server.cpp +++ b/TAO/tests/Bug_1269_Regression/server.cpp @@ -2,7 +2,6 @@ #include "Echo_Caller.h" #include "tao/Messaging/Messaging.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" @@ -39,7 +38,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo_Caller> impl; + PortableServer::Servant_var<Echo_Caller> impl; { Echo_Caller * tmp; // ACE_NEW_RETURN is the worst possible way to handle diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp index d34f224c3bf..3dda8c71a5a 100644 --- a/TAO/tests/Bug_1270_Regression/client.cpp +++ b/TAO/tests/Bug_1270_Regression/client.cpp @@ -3,7 +3,6 @@ #include "Echo.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" @@ -61,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo> impl; + PortableServer::ServantBase_var impl; { Echo * tmp; // ACE_NEW_RETURN is the worst possible way to handle diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp index f4f2c814751..e2641efd61d 100644 --- a/TAO/tests/Bug_1270_Regression/server.cpp +++ b/TAO/tests/Bug_1270_Regression/server.cpp @@ -2,7 +2,6 @@ #include "Echo_Caller.h" #include "tao/Messaging/Messaging.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" @@ -59,7 +58,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo_Caller> impl; + PortableServer::Servant_var<Echo_Caller> impl; { Echo_Caller * tmp; // ACE_NEW_RETURN is the worst possible way to handle diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp index 437c1f772fb..bd9b8da4374 100644 --- a/TAO/tests/Bug_1361_Regression/client.cpp +++ b/TAO/tests/Bug_1361_Regression/client.cpp @@ -2,7 +2,6 @@ #include "Echo.h" #include "ORB_Task.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" @@ -66,9 +65,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo> impl; + PortableServer::ServantBase_var impl; { - Echo * tmp; + Echo * tmp = 0; // ACE_NEW_RETURN is the worst possible way to handle // exceptions (think: what if the constructor allocates memory // and fails?), but I'm not in the mood to fight for a more diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp index 81978f8404c..7ca77b344f3 100644 --- a/TAO/tests/Bug_1361_Regression/server.cpp +++ b/TAO/tests/Bug_1361_Regression/server.cpp @@ -1,7 +1,6 @@ // $Id$ #include "Echo_Caller.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "Server_Thread_Pool.h" @@ -40,9 +39,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_Thread_Manager mymanager; Thread_Pool callback_pool (orb.in (), &mymanager, 10); - TAO::Utils::Servant_Var<Echo_Caller> impl; + PortableServer::ServantBase_var impl; { - Echo_Caller * tmp; + Echo_Caller * tmp = 0; // ACE_NEW_RETURN is the worst possible way to handle // exceptions (think: what if the constructor allocates memory // and fails?), but I'm not in the mood to fight for a more diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp index 6cea3475c70..9b31706698f 100644 --- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp +++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp @@ -4,7 +4,6 @@ #include "tao/Utils/ORB_Destroyer.h" #include "tao/Utils/RIR_Narrow.h" #include "tao/Utils/PolicyList_Destroyer.h" -#include "tao/Utils/Servant_Var.h" PortableServer::POA_ptr create_persistent_POA (PortableServer::POA_ptr parent, diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.h b/TAO/tests/Bug_1551_Regression/Client_Task.h index ff66a0e51a0..1027324cfce 100644 --- a/TAO/tests/Bug_1551_Regression/Client_Task.h +++ b/TAO/tests/Bug_1551_Regression/Client_Task.h @@ -9,7 +9,6 @@ #include "TestC.h" #include "Reply_Handler.h" -#include "tao/Utils/Servant_Var.h" #include "ace/Task.h" /// Implement a Task to run the experiments using multiple threads. @@ -30,7 +29,7 @@ private: /// Reference to the test interface Test::Hello_var receiver_; - TAO::Utils::Servant_Var<Reply_Handler> handler_; + PortableServer::Servant_var <Reply_Handler> handler_; Test::AMI_HelloHandler_var handler_var_; diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp index 24442b26f76..40e406e3ece 100644 --- a/TAO/tests/Bug_1551_Regression/server.cpp +++ b/TAO/tests/Bug_1551_Regression/server.cpp @@ -2,7 +2,6 @@ #include "Hello.h" #include "Server_Task.h" -#include "tao/Utils/Servant_Var.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" @@ -81,7 +80,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return -1; - TAO::Utils::Servant_Var<Hello> hello_impl( + PortableServer::ServantBase_var hello_impl( new Hello(orb.in(), simulate_crashes)); PortableServer::ObjectId_var id = diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp index 74be56e4ecf..9e2a7e30078 100644 --- a/TAO/tests/Bug_1568_Regression/server.cpp +++ b/TAO/tests/Bug_1568_Regression/server.cpp @@ -7,7 +7,6 @@ */ #include "TestS.h" -#include "tao/Utils/Servant_Var.h" #include "tao/corba.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" @@ -128,7 +127,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Simple_C> simple_c_impl( + PortableServer::Servant_var<Simple_C> simple_c_impl( new Simple_C(orb.in())); PortableServer::ObjectId_var id = diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp index 5df548fc503..b8738e8c0ef 100644 --- a/TAO/tests/Bug_1670_Regression/server.cpp +++ b/TAO/tests/Bug_1670_Regression/server.cpp @@ -7,7 +7,6 @@ */ #include "TestS.h" -#include "tao/Utils/Servant_Var.h" #include "tao/corba.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" @@ -130,7 +129,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Simple_C> simple_c_impl( + PortableServer::Servant_var<Simple_C> simple_c_impl( new Simple_C(orb.in())); PortableServer::ObjectId_var id = diff --git a/TAO/tests/Bug_2503_Regression/test_i.cpp b/TAO/tests/Bug_2503_Regression/test_i.cpp index af9c6b79500..945fd5c627d 100644 --- a/TAO/tests/Bug_2503_Regression/test_i.cpp +++ b/TAO/tests/Bug_2503_Regression/test_i.cpp @@ -2,8 +2,6 @@ #include "test_i.h" -#include "tao/Utils/Servant_Var.h" - test_i:: test_i(CORBA::ORB_ptr orb) { @@ -20,7 +18,7 @@ char * test_i:: create_and_activate_server() { - TAO::Utils::Servant_Var<test_i> impl( + PortableServer::Servant_var<test_i> impl( new test_i (this->orb_.in ())); CORBA::Object_var poa_object = diff --git a/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp b/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp index d6ab8a1d16b..56792072cee 100644 --- a/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp +++ b/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp @@ -3,15 +3,14 @@ // #include "Stock_Factory_i.h" -#include "tao/Utils/Servant_Var.h" #include <iostream> Quoter_Stock_Factory_i::Quoter_Stock_Factory_i () { - TAO::Utils::Servant_Var<Quoter_Stock_i> servant1 = + PortableServer::Servant_var<Quoter_Stock_i> servant1 = new Quoter_Stock_i ("RHAT", "RedHat, Inc.", 210); - TAO::Utils::Servant_Var<Quoter_Stock_i> servant2 = + PortableServer::Servant_var<Quoter_Stock_i> servant2 = new Quoter_Stock_i ("MSFT", "Microsoft, Inc.", 91); PortableServer::POA_var poa1 = servant1->_default_POA (); diff --git a/TAO/tests/Bug_3647_Regression/backend_server.cpp b/TAO/tests/Bug_3647_Regression/backend_server.cpp index 91596290ca3..fa06b75a0a3 100644 --- a/TAO/tests/Bug_3647_Regression/backend_server.cpp +++ b/TAO/tests/Bug_3647_Regression/backend_server.cpp @@ -2,10 +2,7 @@ // $Id$ #include "Backend_Impl.h" - #include "tao/Strategies/advanced_resource.h" - -#include "tao/Utils/Servant_Var.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" @@ -69,7 +66,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; using namespace Bug_3647_Regression; - TAO::Utils::Servant_Var<Backend_Impl> impl( + PortableServer::ServantBase_var impl( new Backend_Impl(orb.in(), verbose)); PortableServer::ObjectId_var id = diff --git a/TAO/tests/Bug_3647_Regression/middle_server.cpp b/TAO/tests/Bug_3647_Regression/middle_server.cpp index 4b901c066a3..23f29e825db 100644 --- a/TAO/tests/Bug_3647_Regression/middle_server.cpp +++ b/TAO/tests/Bug_3647_Regression/middle_server.cpp @@ -4,7 +4,6 @@ #include "Middle_Impl.h" #include "tao/Utils/PolicyList_Destroyer.h" -#include "tao/Utils/Servant_Var.h" #include "tao/Utils/RIR_Narrow.h" #include "tao/Strategies/advanced_resource.h" #include "tao/Messaging/Messaging.h" @@ -169,7 +168,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } using namespace Bug_3647_Regression; - TAO::Utils::Servant_Var<Middle_Impl> impl( + PortableServer::ServantBase_var impl( new Middle_Impl(backend.in(), orb.in(), verbose, timeout)); |