diff options
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/utils.h | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp | 4 |
6 files changed, 13 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c33f3be4872..e129ac7c97c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,11 +1,16 @@ Mon Jul 17 17:49:41 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + * examples/POA/On_Demand_Loading/Servant_Manager.cpp: * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: * orbsvcs/orbsvcs/AV/AV_Core.cpp: * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp: * orbsvcs/orbsvcs/IFRService/Container_i.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/utils.h: * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp: * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp: + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp: + * orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp: * tao/Strategies/DIOP_Acceptor.cpp: * tao/Strategies/SHMIOP_Acceptor.cpp: * tao/Strategies/UIOP_Acceptor.cpp: diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp index 8564219f925..ee712b7df80 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp @@ -111,7 +111,7 @@ ServantManager_i::parse_string (const char *s) ACE_CString str (s); - ssize_t index = str.find (':'); + ACE_CString::size_type index = str.find (':'); // On error, npos is returned. if (index == ACE_CString::npos) ACE_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 7884c6c36c7..95684378c77 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -532,7 +532,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, // We assume that the first part of the object name is the server name. // So a name of foo/bar means that the server name is foo. ACE_CString server_name (object_name); - ssize_t pos = server_name.find ('/'); + ACE_CString::size_type pos = server_name.find ('/'); if (pos != ACE_CString::npos) server_name = server_name.substr (pos + 1); diff --git a/TAO/orbsvcs/ImplRepo_Service/utils.h b/TAO/orbsvcs/ImplRepo_Service/utils.h index cf28b14fb75..2e4effd55b9 100644 --- a/TAO/orbsvcs/ImplRepo_Service/utils.h +++ b/TAO/orbsvcs/ImplRepo_Service/utils.h @@ -63,15 +63,15 @@ public: const ACE_CString VALTAG = "value=\""; const ACE_CString ENDTAG = "\""; - ssize_t i = 0; + ACE_CString::size_type i = 0; for (CORBA::ULong idx = 0; ; ++idx) { // find name - ssize_t j = s.find(NAMETAG, i); + ACE_CString::size_type j = s.find(NAMETAG, i); if (j == ACE_CString::npos) break; j += NAMETAG.length(); - ssize_t k = s.find(ENDTAG, j + 1); + ACE_CString::size_type k = s.find(ENDTAG, j + 1); if (k == ACE_CString::npos) break; ACE_CString name = s.substr(j, k - j); diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp index a651f3c4ca4..2c731c8581c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp @@ -75,7 +75,7 @@ Connection_Manager::load_ep_addr (const char* file_name) { ACE_CString token (addr_tokenizer [1]); - int pos = token.find ('\r'); + ACE_CString::size_type pos = token.find ('\r'); if (pos != ACE_CString::npos) { addr->sender_addr = CORBA::string_dup ((token.substr (0, pos)).c_str ()); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp index 9563b6c75f7..45214149850 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp @@ -23,12 +23,12 @@ inventory_i::getCDinfo (const char * artist, ACE_CString name_key ("Beatles"); ACE_CString name (artist); - if (name.strstr (name_key) != -1) + if (name.strstr (name_key) != ACE_CString::npos) { ACE_CString title_key ("Sgt. Pepper"); ACE_CString working_title (title); - if (working_title.strstr (title_key) != -1) + if (working_title.strstr (title_key) != ACE_CString::npos) { title = CORBA::string_dup ("Sgt. Pepper's Lonely Hearts Club Band"); |