From 519988bf9db4b869ed6532762c6aeea8195d8ef7 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 6 Oct 2008 09:00:38 +0000 Subject: Mon Oct 6 08:59:45 UTC 2008 Johnny Willemsen --- TAO/ChangeLog | 12 ++++++++++++ TAO/tests/POA/Loader/Servant_Activator.cpp | 6 +++--- TAO/tests/POA/Loader/Servant_Activator.h | 6 +++--- TAO/tests/POA/Loader/Server_Manager.cpp | 6 +++--- .../POA/On_Demand_Loading/Servant_Activator.cpp | 2 +- TAO/tests/POA/On_Demand_Loading/Servant_Locator.cpp | 2 +- TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp | 10 +++++----- TAO/tests/POA/On_Demand_Loading/Servant_Manager.h | 8 ++++---- TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp | 20 ++++++++++---------- 9 files changed, 42 insertions(+), 30 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 133f5cd539e..06ff324ce08 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Mon Oct 6 08:59:45 UTC 2008 Johnny Willemsen + + * tests/POA/Loader/Servant_Activator.cpp + * tests/POA/Loader/Servant_Activator.h + * tests/POA/Loader/Server_Manager.cpp + * tests/POA/On_Demand_Loading/Servant_Activator.cpp + * tests/POA/On_Demand_Loading/Servant_Locator.cpp + * tests/POA/On_Demand_Loading/Servant_Manager.cpp + * tests/POA/On_Demand_Loading/Servant_Manager.h + * tests/POA/On_Demand_Loading/Server_Manager.cpp + ACE_TCHAR fixes + Mon Oct 6 07:45:45 UTC 2008 Johnny Willemsen * tests/Bug_2319_Regression/server.cpp: diff --git a/TAO/tests/POA/Loader/Servant_Activator.cpp b/TAO/tests/POA/Loader/Servant_Activator.cpp index 4f4f711af5a..76650d877d2 100644 --- a/TAO/tests/POA/Loader/Servant_Activator.cpp +++ b/TAO/tests/POA/Loader/Servant_Activator.cpp @@ -30,9 +30,9 @@ ACE_RCSID (Loader, // is used to kill the servant. ServantActivator::ServantActivator (CORBA::ORB_ptr orb, - const char *dllname, - const char *factory_function, - const char *garbage_collection_function) + const ACE_TCHAR *dllname, + const ACE_TCHAR *factory_function, + const ACE_TCHAR *garbage_collection_function) : orb_ (CORBA::ORB::_duplicate (orb)) { // The dll is opened using the dllname passed. diff --git a/TAO/tests/POA/Loader/Servant_Activator.h b/TAO/tests/POA/Loader/Servant_Activator.h index 8b46a485bfe..2b00f10541a 100644 --- a/TAO/tests/POA/Loader/Servant_Activator.h +++ b/TAO/tests/POA/Loader/Servant_Activator.h @@ -58,9 +58,9 @@ public: // the servant. ServantActivator (CORBA::ORB_ptr orb, - const char *dllname, - const char *factory_function, - const char *garbage_collection_function); + const ACE_TCHAR *dllname, + const ACE_TCHAR *factory_function, + const ACE_TCHAR *garbage_collection_function); // Initialization. virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp index f2fb20c68ad..e7046ba498c 100644 --- a/TAO/tests/POA/Loader/Server_Manager.cpp +++ b/TAO/tests/POA/Loader/Server_Manager.cpp @@ -225,9 +225,9 @@ Server_i::create_activator (PortableServer::POA_var first_poa) ServantActivator *temp_servant_activator; ACE_NEW_RETURN (temp_servant_activator, ServantActivator (orb_.in (), - "Generic_Servant", - "supply_servant", - "destroy_servant"), + ACE_TEXT("Generic_Servant"), + ACE_TEXT("supply_servant"), + ACE_TEXT("destroy_servant")), 0); // Set ServantActivator object as the servant_manager of diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Activator.cpp index aea5dc9147e..b0d2e096c74 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Activator.cpp +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Activator.cpp @@ -42,7 +42,7 @@ ServantActivator_i::incarnate (const PortableServer::ObjectId &oid, // Activate and return the servant else exception. PortableServer::Servant servant = - this->servant_manager_.obtain_servant (s.in (), + this->servant_manager_.obtain_servant (ACE_TEXT_CHAR_TO_TCHAR(s.in ()), poa); if (servant != 0) return servant; diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Locator.cpp index d54ae5d09f7..2eda77ee511 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Locator.cpp +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Locator.cpp @@ -47,7 +47,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid, // test_i. PortableServer::Servant servant = - this->servant_manager_.obtain_servant (s.in (), + this->servant_manager_.obtain_servant (ACE_TEXT_CHAR_TO_TCHAR(s.in ()), poa); if (servant != 0) { diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp index d54400d55ef..a0b7b32bf20 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp @@ -38,7 +38,7 @@ ServantManager_i::~ServantManager_i (void) // operations in the DLL. PortableServer::Servant -ServantManager_i::obtain_servant (const char *str, +ServantManager_i::obtain_servant (const ACE_TCHAR *str, PortableServer::POA_ptr poa) { // The string format is that must be @@ -55,7 +55,7 @@ ServantManager_i::obtain_servant (const char *str, // Obtain the ObjectId from the string argument. PortableServer::ObjectId_var oid = - PortableServer::string_to_ObjectId (str); + PortableServer::string_to_ObjectId (ACE_TEXT_ALWAYS_CHAR (str)); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -107,15 +107,15 @@ ServantManager_i::obtain_servant (const char *str, // to be parsed and separated into tokens to be used. void -ServantManager_i::parse_string (const char *s) +ServantManager_i::parse_string (const ACE_TCHAR *s) { // The format of the objectid is . This // string is parsed to obtain the dll name and the function name // which will create trhe servant and return it to us. - ACE_CString str (s); + ACE_TString str (s); - ACE_CString::size_type index = str.find (':'); + ACE_TString::size_type index = str.find (':'); // On error, npos is returned. if (index == ACE_CString::npos) ACE_ERROR ((LM_ERROR, diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h index 1e8e3f687b4..2ada43d81ab 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h @@ -67,7 +67,7 @@ public: // @@ *done*Kirthika, please explain what this function is USED for, i.e., // who calls it and why? - PortableServer::Servant obtain_servant (const char *str, + PortableServer::Servant obtain_servant (const ACE_TCHAR *str, PortableServer::POA_ptr poa); // Obtains a servant on activation by linking and loading the // appropriate DLL and creating the servant object. The @@ -82,7 +82,7 @@ public: // is closed. private: - void parse_string (const char *s); + void parse_string (const ACE_TCHAR *s); // Parse the string to obtain the DLL name and the factory function // symbol that we will used to dynamically obtain the servant // pointer. @@ -90,10 +90,10 @@ public: CORBA::ORB_var orb_; // A reference to the ORB. - ACE_CString dllname_; + ACE_TString dllname_; // The name of the dll containing the servant. - ACE_CString create_symbol_; + ACE_TString create_symbol_; // The symbol which on getting invoked will give us the servant // pointer. diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp index 714122b9745..6b3ddb6c746 100644 --- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp +++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp @@ -60,14 +60,14 @@ Server_i::write_iors_to_file (const char *first_ior, // No filename was specified; simply return return 0; - char ior_output_file_1[BUFSIZ]; - char ior_output_file_2[BUFSIZ]; + ACE_TCHAR ior_output_file_1[BUFSIZ]; + ACE_TCHAR ior_output_file_2[BUFSIZ]; ACE_OS::sprintf (ior_output_file_1, - "%s_1", + ACE_TEXT("%s_1"), ior_output_file_); ACE_OS::sprintf (ior_output_file_2, - "%s_2", + ACE_TEXT("%s_2"), ior_output_file_); FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, @@ -78,8 +78,8 @@ Server_i::write_iors_to_file (const char *first_ior, || output_file_2 == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IORs: %s, %s\n", - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_1), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_2)), + ior_output_file_1, + ior_output_file_2), -1); int result = ACE_OS::fprintf (output_file_1, @@ -89,8 +89,8 @@ Server_i::write_iors_to_file (const char *first_ior, || static_cast (result) != ACE_OS::strlen (first_ior)) ACE_ERROR_RETURN ((LM_ERROR, "ACE_OS::fprintf failed while writing %s to %s\n", - ACE_TEXT_CHAR_TO_TCHAR (first_ior), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_1)), + first_ior, + ior_output_file_1), -1); result = ACE_OS::fprintf (output_file_2, @@ -100,8 +100,8 @@ Server_i::write_iors_to_file (const char *first_ior, || static_cast (result) != ACE_OS::strlen (second_ior)) ACE_ERROR_RETURN ((LM_ERROR, "ACE_OS::fprintf failed while writing %s to %s\n", - ACE_TEXT_CHAR_TO_TCHAR (second_ior), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_2)), + second_ior, + ior_output_file_2), -1); ACE_OS::fclose (output_file_1); ACE_OS::fclose (output_file_2); -- cgit v1.2.1