Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/predef/compiler/greenhills.h @ 101:c530137014c0
Update Boost headers (1.58.0)
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Sep 2015 11:12:49 +0100 |
| parents | 2665513ce2d3 |
| children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/predef/compiler/greenhills.h Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/predef/compiler/greenhills.h Mon Sep 07 11:12:49 2015 +0100 @@ -1,5 +1,5 @@ /* -Copyright Redshift Software, Inc. 2008-2013 +Copyright Rene Rivera 2008-2014 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) @@ -31,20 +31,26 @@ #define BOOST_COMP_GHS BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__ghs) || defined(__ghs__) -# undef BOOST_COMP_GHS -# if !defined(BOOST_COMP_GHS) && defined(__GHS_VERSION_NUMBER__) -# define BOOST_COMP_GHS BOOST_PREDEF_MAKE_10_VRP(__GHS_VERSION_NUMBER__) +# if !defined(BOOST_COMP_GHS_DETECTION) && defined(__GHS_VERSION_NUMBER__) +# define BOOST_COMP_GHS_DETECTION BOOST_PREDEF_MAKE_10_VRP(__GHS_VERSION_NUMBER__) # endif -# if !defined(BOOST_COMP_GHS) && defined(__ghs) -# define BOOST_COMP_GHS BOOST_PREDEF_MAKE_10_VRP(__ghs) +# if !defined(BOOST_COMP_GHS_DETECTION) && defined(__ghs) +# define BOOST_COMP_GHS_DETECTION BOOST_PREDEF_MAKE_10_VRP(__ghs) # endif -# if !defined(BOOST_COMP_GHS) -# define BOOST_COMP_GHS BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_COMP_GHS_DETECTION) +# define BOOST_COMP_GHS_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_COMP_GHS +#ifdef BOOST_COMP_GHS_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_GHS_EMULATED BOOST_COMP_GHS_DETECTION +# else +# undef BOOST_COMP_GHS +# define BOOST_COMP_GHS BOOST_COMP_GHS_DETECTION +# endif # define BOOST_COMP_GHS_AVAILABLE +# include <boost/predef/detail/comp_detected.h> #endif #define BOOST_COMP_GHS_NAME "Green Hills C/C++" @@ -52,5 +58,10 @@ #include <boost/predef/detail/test.h> BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GHS,BOOST_COMP_GHS_NAME) +#ifdef BOOST_COMP_GHS_EMULATED +#include <boost/predef/detail/test.h> +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GHS_EMULATED,BOOST_COMP_GHS_NAME) +#endif + #endif