Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/predef/compiler/hp_acc.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/hp_acc.h Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/predef/compiler/hp_acc.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) @@ -29,17 +29,23 @@ #define BOOST_COMP_HPACC BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__HP_aCC) -# undef BOOST_COMP_HPACC -# if !defined(BOOST_COMP_HPACC) && (__HP_aCC > 1) -# define BOOST_COMP_HPACC BOOST_PREDEF_MAKE_10_VVRRPP(__HP_aCC) +# if !defined(BOOST_COMP_HPACC_DETECTION) && (__HP_aCC > 1) +# define BOOST_COMP_HPACC_DETECTION BOOST_PREDEF_MAKE_10_VVRRPP(__HP_aCC) # endif -# if !defined(BOOST_COMP_HPACC) -# define BOOST_COMP_HPACC BOOST_VERSION_NUMBER_AVAILABLE +# if !defined(BOOST_COMP_HPACC_DETECTION) +# define BOOST_COMP_HPACC_DETECTION BOOST_VERSION_NUMBER_AVAILABLE # endif #endif -#if BOOST_COMP_HPACC +#ifdef BOOST_COMP_HPACC_DETECTION +# if defined(BOOST_PREDEF_DETAIL_COMP_DETECTED) +# define BOOST_COMP_HPACC_EMULATED BOOST_COMP_HPACC_DETECTION +# else +# undef BOOST_COMP_HPACC +# define BOOST_COMP_HPACC BOOST_COMP_HPACC_DETECTION +# endif # define BOOST_COMP_HPACC_AVAILABLE +# include <boost/predef/detail/comp_detected.h> #endif #define BOOST_COMP_HPACC_NAME "HP aC++" @@ -47,5 +53,10 @@ #include <boost/predef/detail/test.h> BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HPACC,BOOST_COMP_HPACC_NAME) +#ifdef BOOST_COMP_HPACC_EMULATED +#include <boost/predef/detail/test.h> +BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HPACC_EMULATED,BOOST_COMP_HPACC_NAME) +#endif + #endif