Subject: [Boost-commit] svn:boost r67642 - in trunk/boost/ratio: detail/mpl mpl
From: vicente.botet_at_[hidden]
Date: 2011-01-03 18:55:12
Author: viboes
Date: 2011-01-03 18:55:10 EST (Mon, 03 Jan 2011)
New Revision: 67642
URL: http://svn.boost.org/trac/boost/changeset/67642
Log:
Boost.Ratio: Adapt to temporary files waiting for inclusion on boost/mpl
Text files modified:
trunk/boost/ratio/detail/mpl/abs.hpp | 10 ++++++++++
trunk/boost/ratio/detail/mpl/gcd.hpp | 12 +++++++++++-
trunk/boost/ratio/detail/mpl/lcm.hpp | 12 +++++++++++-
trunk/boost/ratio/detail/mpl/sign.hpp | 10 ++++++++++
trunk/boost/ratio/mpl/abs.hpp | 2 +-
trunk/boost/ratio/mpl/gcd.hpp | 2 +-
trunk/boost/ratio/mpl/lcm.hpp | 2 +-
trunk/boost/ratio/mpl/sign.hpp | 2 +-
8 files changed, 46 insertions(+), 6 deletions(-)
Modified: trunk/boost/ratio/detail/mpl/abs.hpp
==============================================================================
--- trunk/boost/ratio/detail/mpl/abs.hpp (original)
+++ trunk/boost/ratio/detail/mpl/abs.hpp 2011-01-03 18:55:10 EST (Mon, 03 Jan 2011)
@@ -19,6 +19,16 @@
#include <boost/mpl/aux_/config/integral.hpp>
#include <boost/mpl/aux_/config/static_constant.hpp>
+#if !defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC_2) \
+ && !defined(BOOST_MPL_PREPROCESSING_MODE) \
+ && ( defined(BOOST_MSVC) \
+ || BOOST_WORKAROUND(__EDG_VERSION__, <= 238) \
+ )
+
+# define BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC_2
+
+#endif
+
namespace boost { namespace mpl {
template< typename Tag > struct abs_impl;
Modified: trunk/boost/ratio/detail/mpl/gcd.hpp
==============================================================================
--- trunk/boost/ratio/detail/mpl/gcd.hpp (original)
+++ trunk/boost/ratio/detail/mpl/gcd.hpp 2011-01-03 18:55:10 EST (Mon, 03 Jan 2011)
@@ -13,7 +13,7 @@
#define BOOST_MPL_GCD_HPP_INCLUDED
#include <boost/mpl/integral_c.hpp>
-#include <boost/mpl/abs.hpp>
+#include <boost/ratio/detail/mpl/abs.hpp>
#include <boost/mpl/aux_/largest_int.hpp>
#include <boost/mpl/aux_/na_spec.hpp>
#include <boost/mpl/aux_/lambda_support.hpp>
@@ -21,6 +21,16 @@
#include <boost/mpl/aux_/config/integral.hpp>
#include <boost/mpl/aux_/config/static_constant.hpp>
+#if !defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC_2) \
+ && !defined(BOOST_MPL_PREPROCESSING_MODE) \
+ && ( defined(BOOST_MSVC) \
+ || BOOST_WORKAROUND(__EDG_VERSION__, <= 238) \
+ )
+
+# define BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC_2
+
+#endif
+
namespace boost { namespace mpl {
template< typename Tag1, typename Tag2 > struct gcd_impl;
Modified: trunk/boost/ratio/detail/mpl/lcm.hpp
==============================================================================
--- trunk/boost/ratio/detail/mpl/lcm.hpp (original)
+++ trunk/boost/ratio/detail/mpl/lcm.hpp 2011-01-03 18:55:10 EST (Mon, 03 Jan 2011)
@@ -13,7 +13,7 @@
#define BOOST_MPL_LCM_HPP_INCLUDED
#include <boost/mpl/integral_c.hpp>
-#include <boost/mpl/abs.hpp>
+#include <boost/ratio/detail/mpl/abs.hpp>
#include <boost/mpl/aux_/largest_int.hpp>
#include <boost/mpl/aux_/na_spec.hpp>
#include <boost/mpl/aux_/lambda_support.hpp>
@@ -21,6 +21,16 @@
#include <boost/mpl/aux_/config/integral.hpp>
#include <boost/mpl/aux_/config/static_constant.hpp>
+#if !defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC_2) \
+ && !defined(BOOST_MPL_PREPROCESSING_MODE) \
+ && ( defined(BOOST_MSVC) \
+ || BOOST_WORKAROUND(__EDG_VERSION__, <= 238) \
+ )
+
+# define BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC_2
+
+#endif
+
namespace boost { namespace mpl {
template< typename Tag1, typename Tag2 > struct lcm_impl;
Modified: trunk/boost/ratio/detail/mpl/sign.hpp
==============================================================================
--- trunk/boost/ratio/detail/mpl/sign.hpp (original)
+++ trunk/boost/ratio/detail/mpl/sign.hpp 2011-01-03 18:55:10 EST (Mon, 03 Jan 2011)
@@ -19,6 +19,16 @@
#include <boost/mpl/aux_/config/integral.hpp>
#include <boost/mpl/aux_/config/static_constant.hpp>
+#if !defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC_2) \
+ && !defined(BOOST_MPL_PREPROCESSING_MODE) \
+ && ( defined(BOOST_MSVC) \
+ || BOOST_WORKAROUND(__EDG_VERSION__, <= 238) \
+ )
+
+# define BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC_2
+
+#endif
+
namespace boost { namespace mpl {
template< typename Tag > struct sign_impl;
Modified: trunk/boost/ratio/mpl/abs.hpp
==============================================================================
--- trunk/boost/ratio/mpl/abs.hpp (original)
+++ trunk/boost/ratio/mpl/abs.hpp 2011-01-03 18:55:10 EST (Mon, 03 Jan 2011)
@@ -11,7 +11,7 @@
#include <boost/ratio.hpp>
#include <boost/ratio/mpl/numeric_cast.hpp>
-#include <boost/mpl/abs.hpp>
+#include <boost/ratio/detail/mpl/abs.hpp>
namespace boost {
namespace mpl {
Modified: trunk/boost/ratio/mpl/gcd.hpp
==============================================================================
--- trunk/boost/ratio/mpl/gcd.hpp (original)
+++ trunk/boost/ratio/mpl/gcd.hpp 2011-01-03 18:55:10 EST (Mon, 03 Jan 2011)
@@ -11,7 +11,7 @@
#include <boost/ratio.hpp>
#include <boost/ratio/mpl/numeric_cast.hpp>
-#include <boost/mpl/gcd.hpp>
+#include <boost/ratio/detail/mpl/gcd.hpp>
namespace boost {
namespace mpl {
Modified: trunk/boost/ratio/mpl/lcm.hpp
==============================================================================
--- trunk/boost/ratio/mpl/lcm.hpp (original)
+++ trunk/boost/ratio/mpl/lcm.hpp 2011-01-03 18:55:10 EST (Mon, 03 Jan 2011)
@@ -11,7 +11,7 @@
#include <boost/ratio.hpp>
#include <boost/ratio/mpl/numeric_cast.hpp>
-#include <boost/mpl/lcm.hpp>
+#include <boost/ratio/detail/mpl/lcm.hpp>
namespace boost {
namespace mpl {
Modified: trunk/boost/ratio/mpl/sign.hpp
==============================================================================
--- trunk/boost/ratio/mpl/sign.hpp (original)
+++ trunk/boost/ratio/mpl/sign.hpp 2011-01-03 18:55:10 EST (Mon, 03 Jan 2011)
@@ -11,7 +11,7 @@
#include <boost/ratio.hpp>
#include <boost/ratio/mpl/numeric_cast.hpp>
-#include <boost/mpl/sign.hpp>
+#include <boost/ratio/detail/mpl/sign.hpp>
namespace boost {
namespace mpl {