diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-12-07 19:19:17 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-12-07 19:19:17 +0000 |
| commit | 8651f49c893c12fd266b52e630923c78a170f92e (patch) | |
| tree | 5a456a4955777b87cd7ac86baaa79da1a682ea45 | |
| parent | aaf54f863dd2a0c636f81ef871e7154e0e3664b3 (diff) | |
| download | ATCD-8651f49c893c12fd266b52e630923c78a170f92e.tar.gz | |
ChangeLogTag: Wed Dec 7 18:56:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index cc977348a1d..9f0c391869c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -12,17 +12,17 @@ #include "ace/Vector_T.h" -// Borland C++ 6 Update Pack 4 and earlier give a warning about comparing +// Borland Developer Studio 2006 and earlier give a warning about comparing // signed and unsigned values in the minimum_polulate() and // initial_populate() warnings. The comparison uses a unsigned long and // unsigned short and it seems that the compiler promotes the unsigned // short of an int and this then gives the warning. Just for Borland // disabled the warning in this file. -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x564) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x581) # pragma option push -w-csu # pragma nopushoptwarn # pragma nopackwarning -#endif /* __BORLANDC__ && __BORLANDC__ <= 0x564 */ +#endif /* __BORLANDC__ && __BORLANDC__ <= 0x581 */ #define TODO int todo; //#define TODO @@ -890,8 +890,8 @@ TAO::PG_Object_Group::has_member_at (const PortableGroup::Location & location) TAO_END_VERSIONED_NAMESPACE_DECL // Restore original compiler flags. -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x564) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x581) # pragma option pop # pragma nopushoptwarn # pragma nopackwarning -#endif /* __BORLANDC__ && __BORLANDC__ <= 0x564 */ +#endif /* __BORLANDC__ && __BORLANDC__ <= 0x581 */ |