diff options
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tests/IDL_Test/union.idl | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 48226158a3c..b27c8dc3ce8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 28 16:15:10 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/IDL_Test/union.idl + Fixed compile problem with SunStudio 12 Update 1 + Fri Jun 26 20:41:53 UTC 2009 Adam Mitz <mitza@ociweb.com> * tao/Block_Flushing_Strategy.h: diff --git a/TAO/tests/IDL_Test/union.idl b/TAO/tests/IDL_Test/union.idl index 3bdb9cbd264..75f1dab325c 100644 --- a/TAO/tests/IDL_Test/union.idl +++ b/TAO/tests/IDL_Test/union.idl @@ -62,7 +62,7 @@ module Necessary // At the moment, the SunCC preprocessor separates the negative // sign from the number. This causes problems for the scanner/lexer // used by tao_idl. -#if !defined (__SUNPRO_CC) || (__SUNPRO_CC > 0x590) +#if !defined (__SUNPRO_CC) || (__SUNPRO_CC > 0x5100) union foo switch (short) { case -3: @@ -71,7 +71,7 @@ union foo switch (short) default: long foo_iface_member; case 0: long foo_iface_member2; }; -#endif /* !__SUNPRO_CC || __SUNPRO_CC > 0x590 */ +#endif /* !__SUNPRO_CC || __SUNPRO_CC > 0x5100 */ // Make sure that CORBA_Any::to_* is used everywhere. module UnionDiscTest |