From 9d1e5f885e47a11340cf6c7d26b247e067709f70 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sun, 28 Jun 2009 16:14:59 +0000 Subject: Sun Jun 28 16:15:10 UTC 2009 Johnny Willemsen * ace/config-lite.h Fixed compile problem with SunStudio 12 Update 1 --- ACE/ChangeLog | 5 +++++ ACE/ace/config-lite.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ACE/ChangeLog b/ACE/ChangeLog index a504c9b6181..afc8cee9a40 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 28 16:15:10 UTC 2009 Johnny Willemsen + + * ace/config-lite.h + Fixed compile problem with SunStudio 12 Update 1 + Sun Jun 28 14:33:10 UTC 2009 Johnny Willemsen * include/makeinclude/platform_sunos5_sunc++.GNU: diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h index 0835426e27c..ca75345f247 100644 --- a/ACE/ace/config-lite.h +++ b/ACE/ace/config-lite.h @@ -122,13 +122,13 @@ ACE_END_VERSIONED_NAMESPACE_DECL // Once all C++ compilers support the standard reverse_iterator // adapters, we can drop this generator macro or at least drop the // MSVC++ or Sun Studio preprocessor conditional blocks. -#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x590 \ +#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5100 \ && !defined (_STLPORT_VERSION) // If we're not using the stlport4 C++ library (which has standard // iterators), we need to ensure this is included in order to test // the _RWSTD_NO_CLASS_PARTIAL_SPEC feature test macro below. # include -#endif /* __SUNPRO_CC <= 0x580 */ +#endif /* __SUNPRO_CC <= 0x5100 */ #if (defined (_MSC_VER) && (_MSC_VER <= 1310) && defined (_WIN64)) \ || defined (ACE_HAS_BROKEN_STD_REVERSE_ITERATOR) // VC 7.1 and the latest 64-bit platform SDK still don't define a standard @@ -137,7 +137,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL typedef std::reverse_iterator reverse_iterator; \ typedef std::reverse_iterator const_reverse_iterator; -#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x590 \ +#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5100 \ && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) # define ACE_DECLARE_STL_REVERSE_ITERATORS \ typedef std::reverse_iterator