diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-07-23 23:12:35 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-07-23 23:12:35 +0000 |
| commit | 90a0929e0c06dc72c5a7248a01aab7e619cb24ab (patch) | |
| tree | 8e08aae6ddd0f3cf9e56b8e1e81269d65b99ce10 | |
| parent | c2d878701d263c04dfa44db05ebddef137eb0d65 (diff) | |
| download | ATCD-90a0929e0c06dc72c5a7248a01aab7e619cb24ab.tar.gz | |
ChangeLogTag:Tue Jul 23 16:10:08 2002 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c899a52f755..71bb22cdbce 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Tue Jul 23 16:10:08 2002 Ossama Othman <ossama@uci.edu> + + * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp + (create_object): + + Cast an unsigned short value to an unsigned long to silence an + apparently bogus Borland C++ warning. Thanks to Jai for + pointing out the warning. + Tue Jul 23 22:23:35 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> * orbsvcs/orbsvcs/AV/TCP.h: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index 50c8fb56849..c13431c2df7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -96,7 +96,8 @@ TAO_PG_GenericFactory::create_object ( // If the number of factories is less than the initial number of // members, then the desired number of members cannot possibly be // created. - if (factory_infos_count < initial_number_members) + if (factory_infos_count < ACE_static_cast (CORBA::ULong, + initial_number_members)) ACE_THROW_RETURN (PortableGroup::CannotMeetCriteria (), CORBA::Object::_nil ()); |