diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-10-17 21:50:53 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-10-17 21:50:53 +0000 |
| commit | ed8738eca5fc51dc456c9acdcfeaf2a90a96308a (patch) | |
| tree | a42a4d93a8285ca08ebfd8558acb2c954f4f58e7 | |
| parent | be0abeebcdabcc604c3414f3ba7b5fae58d21c3c (diff) | |
| download | ATCD-ed8738eca5fc51dc456c9acdcfeaf2a90a96308a.tar.gz | |
ChangeLogTag:Thu Oct 17 14:47:50 2002 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9d763a1da90..e92e0dd09d6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Oct 17 14:47:50 2002 Ossama Othman <ossama@uci.edu> + + * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp + (populate_object_group, process_criteria): + + Explicitly cast an unsigned short value to unsigned long. + Borland C++ apparently gets confused and assumes that the + unsigned short value is signed. Silences a warning. + Thu Oct 17 21:04:49 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> * orbsvcs/orbsvcs/Log/Log_i.cpp: Add missing template instantiation diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index 5865057480d..482fc25f02c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -314,7 +314,9 @@ TAO_PG_GenericFactory::populate_object_group ( { CORBA::ULong factory_infos_count = factory_infos.length (); factory_set.size (factory_infos_count); - for (CORBA::ULong j = 0; j < initial_number_members; ++j) + for (CORBA::ULong j = 0; + j < ACE_static_cast (CORBA::ULong, initial_number_members); + ++j) { const PortableGroup::FactoryInfo &factory_info = factory_infos[j]; @@ -551,7 +553,8 @@ TAO_PG_GenericFactory::process_criteria ( // changed. if (membership_style == PortableGroup::MEMB_INF_CTRL && (minimum_number_members < initial_number_members - || minimum_number_members > factory_infos_count)) + || ACE_static_cast (CORBA::ULong, + minimum_number_members) > factory_infos_count)) { unmet_criteria[uc].nam = name; unmet_criteria[uc++].val = value; |