mirror of
https://github.com/boostorg/mpl.git
synced 2025-08-06 08:14:32 +02:00
Merge vacpp preprocessor fixes from RC_1_34_0
[SVN r35932]
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
// NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION
|
// NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION
|
||||||
|
|
||||||
// Copyright Aleksey Gurtovoy 2000-2004
|
// Copyright Aleksey Gurtovoy 2000-2006
|
||||||
//
|
//
|
||||||
// Distributed under the Boost Software License, Version 1.0.
|
// Distributed under the Boost Software License, Version 1.0.
|
||||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||||
@@ -15,20 +15,28 @@
|
|||||||
|
|
||||||
#include <boost/mpl/aux_/config/compiler.hpp>
|
#include <boost/mpl/aux_/config/compiler.hpp>
|
||||||
#include <boost/mpl/aux_/config/preprocessor.hpp>
|
#include <boost/mpl/aux_/config/preprocessor.hpp>
|
||||||
|
#include <boost/mpl/aux_/config/workaround.hpp>
|
||||||
#include <boost/preprocessor/cat.hpp>
|
#include <boost/preprocessor/cat.hpp>
|
||||||
#include <boost/preprocessor/stringize.hpp>
|
#include <boost/preprocessor/stringize.hpp>
|
||||||
|
|
||||||
#if !defined(BOOST_NEEDS_TOKEN_PASTING_OP_FOR_TOKENS_JUXTAPOSING)
|
#if !defined(BOOST_NEEDS_TOKEN_PASTING_OP_FOR_TOKENS_JUXTAPOSING)
|
||||||
# define AUX_PREPROCESSED_HEADER \
|
# define AUX778076_PREPROCESSED_HEADER \
|
||||||
BOOST_MPL_CFG_COMPILER_DIR/BOOST_MPL_PREPROCESSED_HEADER \
|
BOOST_MPL_CFG_COMPILER_DIR/BOOST_MPL_PREPROCESSED_HEADER \
|
||||||
/**/
|
/**/
|
||||||
#else
|
#else
|
||||||
# define AUX_PREPROCESSED_HEADER \
|
# define AUX778076_PREPROCESSED_HEADER \
|
||||||
BOOST_PP_CAT(BOOST_MPL_CFG_COMPILER_DIR,/)##BOOST_MPL_PREPROCESSED_HEADER \
|
BOOST_PP_CAT(BOOST_MPL_CFG_COMPILER_DIR,/)##BOOST_MPL_PREPROCESSED_HEADER \
|
||||||
/**/
|
/**/
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
# include BOOST_PP_STRINGIZE(boost/mpl/aux_/preprocessed/AUX_PREPROCESSED_HEADER)
|
#if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(700))
|
||||||
# undef AUX_PREPROCESSED_HEADER
|
# define AUX778076_INCLUDE_STRING BOOST_PP_STRINGIZE(boost/mpl/aux_/preprocessed/AUX778076_PREPROCESSED_HEADER)
|
||||||
|
# include AUX778076_INCLUDE_STRING
|
||||||
|
# undef AUX778076_INCLUDE_STRING
|
||||||
|
#else
|
||||||
|
# include BOOST_PP_STRINGIZE(boost/mpl/aux_/preprocessed/AUX778076_PREPROCESSED_HEADER)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
# undef AUX778076_PREPROCESSED_HEADER
|
||||||
|
|
||||||
#undef BOOST_MPL_PREPROCESSED_HEADER
|
#undef BOOST_MPL_PREPROCESSED_HEADER
|
||||||
|
Reference in New Issue
Block a user