|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r70933 - in branches/pplib/variadics/boost/preprocessor: config variadic
From: eldiener_at_[hidden]
Date: 2011-04-03 10:33:30
Author: eldiener
Date: 2011-04-03 10:33:29 EDT (Sun, 03 Apr 2011)
New Revision: 70933
URL: http://svn.boost.org/trac/boost/changeset/70933
Log:
Changes to basic inclusion and naming.
Text files modified:
branches/pplib/variadics/boost/preprocessor/config/variadics.hpp | 17 ++++++-----------
branches/pplib/variadics/boost/preprocessor/variadic/to_array.hpp | 2 +-
branches/pplib/variadics/boost/preprocessor/variadic/to_list.hpp | 2 +-
branches/pplib/variadics/boost/preprocessor/variadic/to_seq.hpp | 2 +-
branches/pplib/variadics/boost/preprocessor/variadic/to_tuple.hpp | 2 +-
5 files changed, 10 insertions(+), 15 deletions(-)
Modified: branches/pplib/variadics/boost/preprocessor/config/variadics.hpp
==============================================================================
--- branches/pplib/variadics/boost/preprocessor/config/variadics.hpp (original)
+++ branches/pplib/variadics/boost/preprocessor/config/variadics.hpp 2011-04-03 10:33:29 EDT (Sun, 03 Apr 2011)
@@ -12,15 +12,7 @@
# ifndef BOOST_PREPROCESSOR_CONFIG_VARIADICS_HPP
# define BOOST_PREPROCESSOR_CONFIG_VARIADICS_HPP
#
-# if defined(BOOST_PP_NO_VARIADICS)
-/*
- This macro allows an end-user to turn off variadic macro
- support in Boost PP even on compilers that support variadic
- macros.
-*/
-# define BOOST_PP_VARIADICS 0
-#
-# else // !defined(BOOST_PP_NO_VARIADICS)
+# if !defined(BOOST_PP_VARIADICS)
#
# if 1
/* This is the code we will use. It is essentially a duplication
@@ -46,8 +38,11 @@
# define BOOST_PP_VARIADICS 0
#endif
#
-#elif defined(__PATHSCALE__) && (__PATHCC__ >= 4)
+#elif defined(__PATHSCALE__)
// PathScale EKOPath compiler (has to come before clang and gcc)
+#if (__PATHCC__ >= 4)
+# define BOOST_PP_VARIADICS 0
+#endif
#
#elif defined __clang__
// Clang C++ emulates GCC, so it has to appear early.
@@ -168,6 +163,6 @@
#
# endif // 1
#
-# endif // BOOST_PP_NO_VARIADICS
+# endif // BOOST_PP_VARIADICS
#
# endif // BOOST_PREPROCESSOR_CONFIG_VARIADICS_HPP
Modified: branches/pplib/variadics/boost/preprocessor/variadic/to_array.hpp
==============================================================================
--- branches/pplib/variadics/boost/preprocessor/variadic/to_array.hpp (original)
+++ branches/pplib/variadics/boost/preprocessor/variadic/to_array.hpp 2011-04-03 10:33:29 EDT (Sun, 03 Apr 2011)
@@ -18,7 +18,7 @@
#
# include <boost/preprocessor/variadic/detail/to_array.hpp>
#
-#define BOOST_PP_TO_ARRAY(...) \
+#define BOOST_PP_VARIADIC_TO_ARRAY(...) \
BOOST_PP_VARIADIC_DETAIL_TO_ARRAY(__VA_ARGS__) \
/**/
#endif // BOOST_PP_VARIADICS
Modified: branches/pplib/variadics/boost/preprocessor/variadic/to_list.hpp
==============================================================================
--- branches/pplib/variadics/boost/preprocessor/variadic/to_list.hpp (original)
+++ branches/pplib/variadics/boost/preprocessor/variadic/to_list.hpp 2011-04-03 10:33:29 EDT (Sun, 03 Apr 2011)
@@ -18,7 +18,7 @@
#
# include <boost/preprocessor/variadic/detail/to_list.hpp>
#
-#define BOOST_PP_TO_LIST(...) \
+#define BOOST_PP_VARIADIC_TO_LIST(...) \
BOOST_PP_VARIADIC_DETAIL_TO_LIST(__VA_ARGS__) \
/**/
#endif // BOOST_PP_VARIADICS
Modified: branches/pplib/variadics/boost/preprocessor/variadic/to_seq.hpp
==============================================================================
--- branches/pplib/variadics/boost/preprocessor/variadic/to_seq.hpp (original)
+++ branches/pplib/variadics/boost/preprocessor/variadic/to_seq.hpp 2011-04-03 10:33:29 EDT (Sun, 03 Apr 2011)
@@ -18,7 +18,7 @@
#
# include <boost/preprocessor/variadic/detail/to_seq.hpp>
#
-#define BOOST_PP_TO_SEQ(...) \
+#define BOOST_PP_VARIADIC_TO_SEQ(...) \
BOOST_PP_VARIADIC_DETAIL_TO_SEQ(__VA_ARGS__) \
/**/
#endif // BOOST_PP_VARIADICS
Modified: branches/pplib/variadics/boost/preprocessor/variadic/to_tuple.hpp
==============================================================================
--- branches/pplib/variadics/boost/preprocessor/variadic/to_tuple.hpp (original)
+++ branches/pplib/variadics/boost/preprocessor/variadic/to_tuple.hpp 2011-04-03 10:33:29 EDT (Sun, 03 Apr 2011)
@@ -18,7 +18,7 @@
#
# include <boost/preprocessor/variadic/detail/to_tuple.hpp>
#
-#define BOOST_PP_TO_TUPLE(...) \
+#define BOOST_PP_VARIADIC_TO_TUPLE(...) \
BOOST_PP_VARIADIC_DETAIL_TO_TUPLE(__VA_ARGS__) \
/**/
#endif // BOOST_PP_VARIADICS
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk