summaryrefslogtreecommitdiff
path: root/boost/predef/compiler/sunpro.h
diff options
context:
space:
mode:
Diffstat (limited to 'boost/predef/compiler/sunpro.h')
-rw-r--r--boost/predef/compiler/sunpro.h25
1 files changed, 17 insertions, 8 deletions
diff --git a/boost/predef/compiler/sunpro.h b/boost/predef/compiler/sunpro.h
index bd3da279dd..92c3926013 100644
--- a/boost/predef/compiler/sunpro.h
+++ b/boost/predef/compiler/sunpro.h
@@ -1,5 +1,5 @@
/*
-Copyright Rene Rivera 2008-2014
+Copyright Rene Rivera 2008-2015
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
@@ -14,7 +14,7 @@ http://www.boost.org/LICENSE_1_0.txt)
/*`
[heading `BOOST_COMP_SUNPRO`]
-[@http://en.wikipedia.org/wiki/Sun_Studio_%28software%29 Sun Studio] compiler.
+[@http://en.wikipedia.org/wiki/Oracle_Solaris_Studio Oracle Solaris Studio] compiler.
Version number available as major, minor, and patch.
[table
@@ -25,6 +25,8 @@ Version number available as major, minor, and patch.
[[`__SUNPRO_CC`] [V.R.P]]
[[`__SUNPRO_C`] [V.R.P]]
+ [[`__SUNPRO_CC`] [VV.RR.P]]
+ [[`__SUNPRO_C`] [VV.RR.P]]
]
*/
@@ -32,10 +34,18 @@ Version number available as major, minor, and patch.
#if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
# if !defined(BOOST_COMP_SUNPRO_DETECTION) && defined(__SUNPRO_CC)
-# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_CC)
+# if (__SUNPRO_CC < 0x5100)
+# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_CC)
+# else
+# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VVRRP(__SUNPRO_CC)
+# endif
# endif
# if !defined(BOOST_COMP_SUNPRO_DETECTION) && defined(__SUNPRO_C)
-# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_C)
+# if (__SUNPRO_C < 0x5100)
+# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_C)
+# else
+# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VVRRP(__SUNPRO_C)
+# endif
# endif
# if !defined(BOOST_COMP_SUNPRO_DETECTION)
# define BOOST_COMP_SUNPRO_DETECTION BOOST_VERSION_NUMBER_AVAILABLE
@@ -53,7 +63,9 @@ Version number available as major, minor, and patch.
# include <boost/predef/detail/comp_detected.h>
#endif
-#define BOOST_COMP_SUNPRO_NAME "Sun Studio"
+#define BOOST_COMP_SUNPRO_NAME "Oracle Solaris Studio"
+
+#endif
#include <boost/predef/detail/test.h>
BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO,BOOST_COMP_SUNPRO_NAME)
@@ -62,6 +74,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO,BOOST_COMP_SUNPRO_NAME)
#include <boost/predef/detail/test.h>
BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO_EMULATED,BOOST_COMP_SUNPRO_NAME)
#endif
-
-
-#endif