diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-10-17 10:34:21 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-10-17 10:34:21 +0000 |
| commit | a3f2779f267ea6604b410a56d90fc3fb5e31054f (patch) | |
| tree | 7b71b785a6800b49856a3d9c40a769e883d54781 /TAO/orbsvcs | |
| parent | 3031c29ed28bca3696e0642800a38364e5e8cf1d (diff) | |
| download | ATCD-a3f2779f267ea6604b410a56d90fc3fb5e31054f.tar.gz | |
ChangeLogTag: Fri Oct 17 10:35:00 UTC 2008 Simon Massey <sma at prismtech dot com>
Diffstat (limited to 'TAO/orbsvcs')
5 files changed, 6 insertions, 7 deletions
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp index 81dfc721ed7..ff8a8eb65c5 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp @@ -169,7 +169,7 @@ ConsoleHandler (DWORD /* ctrlType */) ACE_NT_SERVICE_DEFINE (service, TAO_NT_Naming_Service, - "TAO NT Naming Service"); + ACE_TEXT ("TAO NT Naming Service")); int Options::run (int argc, ACE_TCHAR* argv[]) diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp index 33d89b91d76..44e68a9443d 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp @@ -172,7 +172,7 @@ ConsoleHandler (DWORD /* ctrlType */) ACE_NT_SERVICE_DEFINE (service, TAO_NT_Notify_Service, - "TAO NT Notify Service"); + ACE_TEXT ("TAO NT Notify Service")); int Options::run (int argc, ACE_TCHAR* argv[]) diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h index 07b4193106d..1351af8fb4e 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h @@ -25,7 +25,7 @@ private: CORBA::ORB_var orb_; std::vector<ACE_TString> iors_; - char pauseType_; + ACE_TCHAR pauseType_; int startupPause_; int threadCount_; int instance_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index ec4445b528d..53f81e124d7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -437,8 +437,8 @@ TAO_Naming_Context::to_url (const char * addr, *dest = '%'; ++dest; // Append the hexadecimal representation of the character. - *dest = ACE::nibble2hex ((*i) >> 4); ++dest; - *dest = ACE::nibble2hex (*i); ++dest; + *dest = ACE::nibble2hex (static_cast<char> (*i) >> 4); ++dest; + *dest = ACE::nibble2hex (static_cast<char> (*i)); ++dest; } // Terminate the string diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp index e73677a9016..19904fd2479 100644 --- a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp +++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp @@ -48,7 +48,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - CORBA::ORB_var orb; CORBA::Object_var obj; PortableServer::POA_var root_poa; @@ -79,7 +78,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_TEXT ("iiop://localhost:%d/ssl_port=%d"), endpoint_port+10, endpoint_port+11); - char **largv = new ACE_TCHAR *[argc+4]; + ACE_TCHAR **largv = new ACE_TCHAR *[argc+4]; int i = 0; for (i = 0; i < argc; i++) largv[i] = argv[i]; |