summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2014-11-13 11:36:14 +0000
committerSteve Huston <shuston@riverace.com>2014-11-13 11:36:14 +0000
commit4dcd3bd476f92ddf52e681f2683d49f6154b9531 (patch)
treef17c8e66da51443eca0e3d845d4313da76b589e7
parent80f5e3ad78c071206b27995e5bd0f7cdef9bb933 (diff)
downloadATCD-4dcd3bd476f92ddf52e681f2683d49f6154b9531.tar.gz
ChangeLogTag:Thu Nov 13 11:31:37 UTC 2014 Steve Huston <shuston@riverace.com>
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/NEWS2
-rw-r--r--ACE/ace/config-lite.h4
3 files changed, 11 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 359bafaf745..33d438c4311 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 13 11:31:37 UTC 2014 Steve Huston <shuston@riverace.com>
+
+ * ace/config-lite.h: Adjust ACE_DECLARE_STL_REVERSE_ITERATORS to
+ work with Solaris Studio 12.4.
+
+ * NEWS: Note support for Solaris Studio 12.4.
+
Mon Nov 10 15:45:42 UTC 2014 Johnny Willemsen <willemsen_j@remedy.nl>
* ace/CDR_Stream.h:
diff --git a/ACE/NEWS b/ACE/NEWS
index df7cf87aa00..e6d4d3dbb11 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,6 +1,8 @@
USER VISIBLE CHANGES BETWEEN ACE-6.2.8 and ACE-6.3.0
====================================================
+. ACE now supports Oracle Solaris Studio 12.4 on Solaris.
+
. New config macros were added:
ACE_DISABLE_MKTEMP: Disables the availability of ACE_OS::mktemp().
ACE_DISABLE_TEMPNAM: Disables the availability of ACE_OS::tempnam().
diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h
index 05559daa877..b000a20e77c 100644
--- a/ACE/ace/config-lite.h
+++ b/ACE/ace/config-lite.h
@@ -116,7 +116,7 @@ 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 <= 0x5120 \
+#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5130 \
&& !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
@@ -131,7 +131,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
typedef std::reverse_iterator<iterator, value_type> reverse_iterator; \
typedef std::reverse_iterator<const_iterator, \
value_type const> const_reverse_iterator;
-#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5120 \
+#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5130 \
&& defined (_RWSTD_NO_CLASS_PARTIAL_SPEC)
# define ACE_DECLARE_STL_REVERSE_ITERATORS \
typedef std::reverse_iterator<iterator, \