diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-28 07:46:18 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-28 07:46:18 +0000 |
| commit | b02c515a2f513cb9089939610e6cfe31d4a07332 (patch) | |
| tree | 2899b6a339b455a9e03ff581ab5c683c2521906c /TAO/tests/Bug_3647_Regression | |
| parent | fd29b8f755fd74586c2eb6ee65da65301dd33777 (diff) | |
| download | ATCD-b02c515a2f513cb9089939610e6cfe31d4a07332.tar.gz | |
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
Diffstat (limited to 'TAO/tests/Bug_3647_Regression')
| -rw-r--r-- | TAO/tests/Bug_3647_Regression/backend_server.cpp | 5 | ||||
| -rw-r--r-- | TAO/tests/Bug_3647_Regression/middle_server.cpp | 3 |
2 files changed, 2 insertions, 6 deletions
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)); |