diff options
| -rw-r--r-- | TAO/CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp | 12 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp | 2 |
3 files changed, 17 insertions, 6 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 7320924d658..7c2830e5cd4 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Mon Jul 17 17:49:41 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: + + Use new ACE_CString::size_type type to hold string + position/index value, instead of "int". Addresses "comparison + between signed and unsigned" warnings. + Sat Jul 15 04:21:13 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> * DAnCE/RepositoryManager/README.txt: diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index bfa44c5ba6e..a9fe01d3e94 100644 --- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -1036,16 +1036,18 @@ populate_binding_info (const ACE_CString& name, retv->name_ = name; - // Parse the child_uuid string and populate the "node" name and "plan_uuid" fields. - // Our protocol here is searching for the "@", the substring *before* that is the - // global plan uuid, and the substring *after* that is the node name. - size_t pos = child_uuid.find ('@'); + // Parse the child_uuid string and populate the "node" name and + // "plan_uuid" fields. Our protocol here is searching for the "@", + // the substring *before* that is the global plan uuid, and the + // substring *after* that is the node name. + ACE_CString::size_type pos = child_uuid.find ('@'); retv->plan_uuid_ = child_uuid.substring (0, pos); retv->node_ = - child_uuid.substring (pos+1, -1); // get the rest of the string + child_uuid.substring (pos + 1, + ACE_CString::npos); // get the rest of the string Deployment::Connections_var connections; ACE_NEW_RETURN (connections, diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp index e17042ff118..67f0f9d7363 100644 --- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp +++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp @@ -301,7 +301,7 @@ namespace CIAO } ACE_CString tmp = arti.name.in (); - ssize_t pos; + ACE_CString::size_type pos; //@@ Note: I am not checking for redundancy here. Maybe // the modeling tool should make sure of |