[Boost-commit] svn:boost r82921 - in trunk/boost/math: special_functions/detail tools

Subject: [Boost-commit] svn:boost r82921 - in trunk/boost/math: special_functions/detail tools
From: john_at_[hidden]
Date: 2013-02-16 07:47:19

Author: johnmaddock
Date: 2013-02-16 07:47:18 EST (Sat, 16 Feb 2013)
New Revision: 82921
URL: http://svn.boost.org/trac/boost/changeset/82921

Log:
Fix cyclic dependency.
Fixes #7999.
Text files modified: 
   trunk/boost/math/special_functions/detail/round_fwd.hpp |    12 ++++++++++++                            
   trunk/boost/math/tools/config.hpp                       |    13 +++----------                           
   2 files changed, 15 insertions(+), 10 deletions(-)

Modified: trunk/boost/math/special_functions/detail/round_fwd.hpp
==============================================================================
--- trunk/boost/math/special_functions/detail/round_fwd.hpp	(original)
+++ trunk/boost/math/special_functions/detail/round_fwd.hpp	2013-02-16 07:47:18 EST (Sat, 16 Feb 2013)
@@ -77,5 +77,17 @@
 
    }
 }
+
+#undef BOOST_MATH_STD_USING
+#define BOOST_MATH_STD_USING BOOST_MATH_STD_USING_CORE\
+   using boost::math::round;\
+   using boost::math::iround;\
+   using boost::math::lround;\
+   using boost::math::trunc;\
+   using boost::math::itrunc;\
+   using boost::math::ltrunc;\
+   using boost::math::modf;
+
+
 #endif // BOOST_MATH_SPECIAL_ROUND_FWD_HPP
 

Modified: trunk/boost/math/tools/config.hpp
==============================================================================
--- trunk/boost/math/tools/config.hpp	(original)
+++ trunk/boost/math/tools/config.hpp	2013-02-16 07:47:18 EST (Sat, 16 Feb 2013)
@@ -22,7 +22,6 @@
 #endif
 
 #include <boost/math/tools/user.hpp>
-#include <boost/math/special_functions/detail/round_fwd.hpp>
 
 #if (defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) \
    || (defined(__hppa) && !defined(__OpenBSD__)) || (defined(__NO_LONG_DOUBLE_MATH) && (DBL_MANT_DIG != LDBL_MANT_DIG))) \
@@ -218,7 +217,7 @@
 //
 // Helper macro for using statements:
 //
-#define BOOST_MATH_STD_USING \
+#define BOOST_MATH_STD_USING_CORE \
    using std::abs;\
    using std::acos;\
    using std::cos;\
@@ -241,15 +240,9 @@
    using std::ceil;\
    using std::floor;\
    using std::log10;\
-   using std::sqrt;\
-   using boost::math::round;\
-   using boost::math::iround;\
-   using boost::math::lround;\
-   using boost::math::trunc;\
-   using boost::math::itrunc;\
-   using boost::math::ltrunc;\
-   using boost::math::modf;
+   using std::sqrt;
 
+#define BOOST_MATH_STD_USING BOOST_MATH_STD_USING_CORE
 
 namespace boost{ namespace math{
 namespace tools