diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-03-22 17:04:37 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-03-22 17:04:37 +0000 |
| commit | 9769525dd825d49b129539562b09675cb9b871c6 (patch) | |
| tree | 566fa5179a58fa4d2fbd5c970595d41a5f3056cf | |
| parent | 739bf26d5985e827218f6dc43137f938deaa0fb4 (diff) | |
| download | ATCD-9769525dd825d49b129539562b09675cb9b871c6.tar.gz | |
ChangeLogTag: Wed Mar 22 15:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 8b7f405ada9..09d492e76a0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -18,14 +18,13 @@ // 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__ <= 0x581) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) # pragma option push -w-csu # pragma nopushoptwarn # pragma nopackwarning -#endif /* __BORLANDC__ && __BORLANDC__ <= 0x581 */ +#endif /* __BORLANDC__ && __BORLANDC__ <= 0x582 */ #define TODO int todo; -//#define TODO TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -890,8 +889,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__ <= 0x581) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) # pragma option pop # pragma nopushoptwarn # pragma nopackwarning -#endif /* __BORLANDC__ && __BORLANDC__ <= 0x581 */ +#endif /* __BORLANDC__ && __BORLANDC__ <= 0x582 */ |