Apply changes to BOOST_PREVENT_MACRO_SUB in src folder

include_private/boost/math/tools/test.hpp

@@ -34,8 +34,8 @@ public:
    void add(const T& point){ stat.add(point); }
    // accessors:
    unsigned worst()const{ return worst_case; }
-   T min BOOST_PREVENT_MACRO_SUBSTITUTION()const{ return (stat.min)(); }
-   T max BOOST_PREVENT_MACRO_SUBSTITUTION()const{ return (stat.max)(); }
+   T min BOOST_MATH_PREVENT_MACRO_SUBSTITUTION()const{ return (stat.min)(); }
+   T max BOOST_MATH_PREVENT_MACRO_SUBSTITUTION()const{ return (stat.max)(); }
    T total()const{ return stat.total(); }
    T mean()const{ return stat.mean(); }
    std::uintmax_t count()const{ return stat.count(); }

src/tr1/acosh.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/acosh.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_acosh BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_acosh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::acosh BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::acosh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/acoshf.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/acosh.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_acoshf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_acoshf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::acosh BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::acosh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/acoshl.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/acosh.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_acoshl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_acoshl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::acosh BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::acosh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/asinh.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/asinh.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_asinh BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_asinh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::asinh BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::asinh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/asinhf.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/asinh.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_asinhf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_asinhf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::asinh BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::asinh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/asinhl.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/asinh.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_asinhl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_asinhl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::asinh BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::asinh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/assoc_laguerre.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/laguerre.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_assoc_laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_assoc_laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(n, m, x);
+   return c_policies::laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, m, x);
 }
 
 

src/tr1/assoc_laguerref.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/laguerre.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_assoc_laguerref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_assoc_laguerref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(n, m, x);
+   return c_policies::laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, m, x);
 }
 
 

src/tr1/assoc_laguerrel.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/laguerre.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_assoc_laguerrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_assoc_laguerrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, unsigned m, long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(n, m, x);
+   return c_policies::laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, m, x);
 }
 
 

src/tr1/assoc_legendre.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/legendre.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_assoc_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_assoc_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return (m&1 ? -1 : 1) * c_policies::legendre_p BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, x);
+   return (m&1 ? -1 : 1) * c_policies::legendre_p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, x);
 }
 
 

src/tr1/assoc_legendref.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/legendre.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_assoc_legendref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_assoc_legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return (m&1 ? -1 : 1) * c_policies::legendre_p BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, x);
+   return (m&1 ? -1 : 1) * c_policies::legendre_p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, x);
 }
 
 

src/tr1/assoc_legendrel.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/legendre.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_assoc_legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_assoc_legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned l, unsigned m, long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return (m&1 ? -1 : 1) * c_policies::legendre_p BOOST_PREVENT_MACRO_SUBSTITUTION(l, m, x);
+   return (m&1 ? -1 : 1) * c_policies::legendre_p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(l, m, x);
 }
 
 

src/tr1/atanh.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/atanh.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_atanh BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_atanh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::atanh BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::atanh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/atanhf.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/atanh.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_atanhf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_atanhf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::atanh BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::atanh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/atanhl.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/atanh.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_atanhl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_atanhl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::atanh BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::atanh BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/beta.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/beta.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_beta BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_beta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::beta BOOST_PREVENT_MACRO_SUBSTITUTION(x, y);
+   return c_policies::beta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y);
 }
 
 

src/tr1/betaf.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/beta.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_betaf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_betaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::beta BOOST_PREVENT_MACRO_SUBSTITUTION(x, y);
+   return c_policies::beta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y);
 }
 
 

src/tr1/betal.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/beta.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_betal BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_betal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::beta BOOST_PREVENT_MACRO_SUBSTITUTION(x, y);
+   return c_policies::beta BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y);
 }
 
 

src/tr1/cbrt.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/cbrt.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_cbrt BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_cbrt BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cbrt BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::cbrt BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/cbrtf.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/cbrt.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_cbrtf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_cbrtf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cbrt BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::cbrt BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/cbrtl.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/cbrt.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_cbrtl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_cbrtl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cbrt BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::cbrt BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/comp_ellint_1.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_1.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_comp_ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_comp_ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/comp_ellint_1f.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_1.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_comp_ellint_1f BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_comp_ellint_1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/comp_ellint_1l.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_1.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_comp_ellint_1l BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_comp_ellint_1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/comp_ellint_2.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_2.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_comp_ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_comp_ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/comp_ellint_2f.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_2.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_comp_ellint_2f BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_comp_ellint_2f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/comp_ellint_2l.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_2.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_comp_ellint_2l BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_comp_ellint_2l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/comp_ellint_3.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_3.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_comp_ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(double k, double nu) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_comp_ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k, double nu) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(k, nu);
+   return c_policies::ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, nu);
 }
 
 

src/tr1/comp_ellint_3f.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_3.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_comp_ellint_3f BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float nu) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_comp_ellint_3f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float nu) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(k, nu);
+   return c_policies::ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, nu);
 }
 
 

src/tr1/comp_ellint_3l.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_3.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_comp_ellint_3l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double nu) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_comp_ellint_3l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double nu) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(k, nu);
+   return c_policies::ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, nu);
 }
 
 

src/tr1/copysign.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/sign.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_copysign BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_copysign BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC
 {
-   return boost::math::copysign BOOST_PREVENT_MACRO_SUBSTITUTION(x, y);
+   return boost::math::copysign BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y);
 }
 
 

src/tr1/copysignf.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/sign.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_copysignf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_copysignf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC
 {
-   return boost::math::copysign BOOST_PREVENT_MACRO_SUBSTITUTION(x, y);
+   return boost::math::copysign BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y);
 }
 
 

src/tr1/copysignl.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/sign.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_copysignl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_copysignl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC
 {
-   return boost::math::copysign BOOST_PREVENT_MACRO_SUBSTITUTION(x, y);
+   return boost::math::copysign BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y);
 }
 
 

src/tr1/cyl_bessel_i.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_cyl_bessel_i BOOST_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_cyl_bessel_i BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cyl_bessel_i BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x);
+   return c_policies::cyl_bessel_i BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x);
 }
 
 

src/tr1/cyl_bessel_if.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_cyl_bessel_if BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_cyl_bessel_if BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cyl_bessel_i BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x);
+   return c_policies::cyl_bessel_i BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x);
 }
 
 

src/tr1/cyl_bessel_il.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_cyl_bessel_il BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_cyl_bessel_il BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cyl_bessel_i BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x);
+   return c_policies::cyl_bessel_i BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x);
 }
 
 

src/tr1/cyl_bessel_j.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_cyl_bessel_j BOOST_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_cyl_bessel_j BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cyl_bessel_j BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x);
+   return c_policies::cyl_bessel_j BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x);
 }
 
 

src/tr1/cyl_bessel_jf.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_cyl_bessel_jf BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_cyl_bessel_jf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cyl_bessel_j BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x);
+   return c_policies::cyl_bessel_j BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x);
 }
 
 

src/tr1/cyl_bessel_jl.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_cyl_bessel_jl BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_cyl_bessel_jl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cyl_bessel_j BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x);
+   return c_policies::cyl_bessel_j BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x);
 }
 
 

src/tr1/cyl_bessel_k.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_cyl_bessel_k BOOST_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_cyl_bessel_k BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cyl_bessel_k BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x);
+   return c_policies::cyl_bessel_k BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x);
 }
 
 

src/tr1/cyl_bessel_kf.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_cyl_bessel_kf BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_cyl_bessel_kf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cyl_bessel_k BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x);
+   return c_policies::cyl_bessel_k BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x);
 }
 
 

src/tr1/cyl_bessel_kl.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_cyl_bessel_kl BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_cyl_bessel_kl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cyl_bessel_k BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x);
+   return c_policies::cyl_bessel_k BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x);
 }
 
 

src/tr1/cyl_neumann.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_cyl_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_cyl_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double nu, double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cyl_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x);
+   return c_policies::cyl_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x);
 }
 
 

src/tr1/cyl_neumannf.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_cyl_neumannf BOOST_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_cyl_neumannf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float nu, float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cyl_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x);
+   return c_policies::cyl_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x);
 }
 
 

src/tr1/cyl_neumannl.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_cyl_neumannl BOOST_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_cyl_neumannl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double nu, long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::cyl_neumann BOOST_PREVENT_MACRO_SUBSTITUTION(nu, x);
+   return c_policies::cyl_neumann BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(nu, x);
 }
 
 

src/tr1/ellint_1.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_1.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(double k, double phi) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k, double phi) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi);
+   return c_policies::ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi);
 }
 
 

src/tr1/ellint_1f.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_1.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_ellint_1f BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float phi) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_ellint_1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float phi) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi);
+   return c_policies::ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi);
 }
 
 

src/tr1/ellint_1l.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_1.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_ellint_1l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_ellint_1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_1 BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi);
+   return c_policies::ellint_1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi);
 }
 
 

src/tr1/ellint_2.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_2.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(double k, double phi) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k, double phi) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi);
+   return c_policies::ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi);
 }
 
 

src/tr1/ellint_2f.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_2.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_ellint_2f BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float phi) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_ellint_2f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float phi) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi);
+   return c_policies::ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi);
 }
 
 

src/tr1/ellint_2l.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_2.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_ellint_2l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_ellint_2l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double phi) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_2 BOOST_PREVENT_MACRO_SUBSTITUTION(k, phi);
+   return c_policies::ellint_2 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, phi);
 }
 
 

src/tr1/ellint_3.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_3.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(double k, double nu, double phi) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double k, double nu, double phi) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(k, nu, phi);
+   return c_policies::ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, nu, phi);
 }
 
 

src/tr1/ellint_3f.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_3.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_ellint_3f BOOST_PREVENT_MACRO_SUBSTITUTION(float k, float nu, float phi) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_ellint_3f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float k, float nu, float phi) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(k, nu, phi);
+   return c_policies::ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, nu, phi);
 }
 
 

src/tr1/ellint_3l.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/ellint_3.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_ellint_3l BOOST_PREVENT_MACRO_SUBSTITUTION(long double k, long double nu, long double phi) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_ellint_3l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double k, long double nu, long double phi) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::ellint_3 BOOST_PREVENT_MACRO_SUBSTITUTION(k, nu, phi);
+   return c_policies::ellint_3 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(k, nu, phi);
 }
 
 

src/tr1/erf.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/erf.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_erf BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_erf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::erf BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::erf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/erfc.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/erf.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_erfc BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_erfc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::erfc BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::erfc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/erfcf.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/erf.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_erfcf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_erfcf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::erfc BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::erfc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/erfcl.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/erf.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_erfcl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_erfcl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::erfc BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::erfc BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/erff.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/erf.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_erff BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_erff BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::erf BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::erf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/erfl.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/erf.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_erfl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_erfl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::erf BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::erf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/expint.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/expint.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_expint BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_expint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::expint BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::expint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/expintf.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/expint.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_expintf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_expintf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::expint BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::expint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/expintl.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/expint.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_expintl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_expintl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::expint BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::expint BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/expm1.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/expm1.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_expm1 BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_expm1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::expm1 BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::expm1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/expm1f.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/expm1.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_expm1f BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_expm1f BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::expm1 BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::expm1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/expm1l.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/expm1.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_expm1l BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_expm1l BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::expm1 BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::expm1 BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 

src/tr1/fmax.cpp

@@ -11,7 +11,7 @@
 #include <boost/math/special_functions/fpclassify.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_fmax BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_fmax BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC
 {
    if((boost::math::isnan)(x))
       return y;

src/tr1/fmaxf.cpp

@@ -11,7 +11,7 @@
 #include <boost/math/special_functions/fpclassify.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_fmaxf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_fmaxf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC
 {
    if((boost::math::isnan)(x))
       return y;

src/tr1/fmaxl.cpp

@@ -11,7 +11,7 @@
 #include <boost/math/special_functions/fpclassify.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_fmaxl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_fmaxl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC
 {
    if((boost::math::isnan)(x))
       return y;

src/tr1/fmin.cpp

@@ -11,7 +11,7 @@
 #include <boost/math/special_functions/fpclassify.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_fmin BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_fmin BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC
 {
    if((boost::math::isnan)(x))
       return y;

src/tr1/fminf.cpp

@@ -11,7 +11,7 @@
 #include <boost/math/special_functions/fpclassify.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_fminf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_fminf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC
 {
    if((boost::math::isnan)(x))
       return y;

src/tr1/fminl.cpp

@@ -11,7 +11,7 @@
 #include <boost/math/special_functions/fpclassify.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_fminl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_fminl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC
 {
    if((boost::math::isnan)(x))
       return y;

src/tr1/fpclassify.cpp

@@ -19,32 +19,32 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-template<> bool BOOST_MATH_TR1_DECL signbit<double> BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
+template<> bool BOOST_MATH_TR1_DECL signbit<double> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
 {
    return static_cast<bool>((boost::math::signbit)(x));
 }
 
-template<> int BOOST_MATH_TR1_DECL fpclassify<double> BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
+template<> int BOOST_MATH_TR1_DECL fpclassify<double> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
 {
    return (boost::math::fpclassify)(x);
 }
 
-template<> bool BOOST_MATH_TR1_DECL isfinite<double> BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
+template<> bool BOOST_MATH_TR1_DECL isfinite<double> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
 {
    return (boost::math::isfinite)(x);
 }
 
-template<> bool BOOST_MATH_TR1_DECL isinf<double> BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
+template<> bool BOOST_MATH_TR1_DECL isinf<double> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
 {
    return (boost::math::isinf)(x);
 }
 
-template<> bool BOOST_MATH_TR1_DECL isnan<double> BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
+template<> bool BOOST_MATH_TR1_DECL isnan<double> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
 {
    return (boost::math::isnan)(x);
 }
 
-template<> bool BOOST_MATH_TR1_DECL isnormal<double> BOOST_PREVENT_MACRO_SUBSTITUTION(double x)
+template<> bool BOOST_MATH_TR1_DECL isnormal<double> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x)
 {
    return (boost::math::isnormal)(x);
 }

src/tr1/fpclassifyf.cpp

@@ -19,32 +19,32 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-template<> bool BOOST_MATH_TR1_DECL signbit<float> BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
+template<> bool BOOST_MATH_TR1_DECL signbit<float> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
 {
    return static_cast<bool>((boost::math::signbit)(x));
 }
 
-template<> int BOOST_MATH_TR1_DECL fpclassify<float> BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
+template<> int BOOST_MATH_TR1_DECL fpclassify<float> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
 {
    return (boost::math::fpclassify)(x);
 }
 
-template<> bool BOOST_MATH_TR1_DECL isfinite<float> BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
+template<> bool BOOST_MATH_TR1_DECL isfinite<float> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
 {
    return (boost::math::isfinite)(x);
 }
 
-template<> bool BOOST_MATH_TR1_DECL isinf<float> BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
+template<> bool BOOST_MATH_TR1_DECL isinf<float> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
 {
    return (boost::math::isinf)(x);
 }
 
-template<> bool BOOST_MATH_TR1_DECL isnan<float> BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
+template<> bool BOOST_MATH_TR1_DECL isnan<float> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
 {
    return (boost::math::isnan)(x);
 }
 
-template<> bool BOOST_MATH_TR1_DECL isnormal<float> BOOST_PREVENT_MACRO_SUBSTITUTION(float x)
+template<> bool BOOST_MATH_TR1_DECL isnormal<float> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x)
 {
    return (boost::math::isnormal)(x);
 }

src/tr1/fpclassifyl.cpp

@@ -19,32 +19,32 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-template<> bool BOOST_MATH_TR1_DECL signbit<long double> BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
+template<> bool BOOST_MATH_TR1_DECL signbit<long double> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
 {
    return static_cast<bool>((boost::math::signbit)(x));
 }
 
-template<> int BOOST_MATH_TR1_DECL fpclassify<long double> BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
+template<> int BOOST_MATH_TR1_DECL fpclassify<long double> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
 {
    return (boost::math::fpclassify)(x);
 }
 
-template<> bool BOOST_MATH_TR1_DECL isfinite<long double> BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
+template<> bool BOOST_MATH_TR1_DECL isfinite<long double> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
 {
    return (boost::math::isfinite)(x);
 }
 
-template<> bool BOOST_MATH_TR1_DECL isinf<long double> BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
+template<> bool BOOST_MATH_TR1_DECL isinf<long double> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
 {
    return (boost::math::isinf)(x);
 }
 
-template<> bool BOOST_MATH_TR1_DECL isnan<long double> BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
+template<> bool BOOST_MATH_TR1_DECL isnan<long double> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
 {
    return (boost::math::isnan)(x);
 }
 
-template<> bool BOOST_MATH_TR1_DECL isnormal<long double> BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
+template<> bool BOOST_MATH_TR1_DECL isnormal<long double> BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x)
 {
    return (boost::math::isnormal)(x);
 }

src/tr1/hermite.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/hermite.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_hermite BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_hermite BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::hermite BOOST_PREVENT_MACRO_SUBSTITUTION(n, x);
+   return c_policies::hermite BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x);
 }
 
 

src/tr1/hermitef.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/hermite.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_hermitef BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_hermitef BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::hermite BOOST_PREVENT_MACRO_SUBSTITUTION(n, x);
+   return c_policies::hermite BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x);
 }
 
 

src/tr1/hermitel.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/hermite.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_hermitel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_hermitel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::hermite BOOST_PREVENT_MACRO_SUBSTITUTION(n, x);
+   return c_policies::hermite BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x);
 }
 
 

src/tr1/hypot.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" double BOOST_MATH_TR1_DECL boost_hypot BOOST_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_hypot BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x, double y) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::hypot BOOST_PREVENT_MACRO_SUBSTITUTION(x, y);
+   return c_policies::hypot BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y);
 }
 
 }}}

src/tr1/hypotf.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" float BOOST_MATH_TR1_DECL boost_hypotf BOOST_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_hypotf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x, float y) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::hypot BOOST_PREVENT_MACRO_SUBSTITUTION(x, y);
+   return c_policies::hypot BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y);
 }
 
 }}}

src/tr1/hypotl.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_hypotl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_hypotl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::hypot BOOST_PREVENT_MACRO_SUBSTITUTION(x, y);
+   return c_policies::hypot BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x, y);
 }
 
 }}}

src/tr1/laguerre.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/laguerre.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(n, x);
+   return c_policies::laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x);
 }
 
 

src/tr1/laguerref.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/laguerre.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_laguerref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_laguerref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(n, x);
+   return c_policies::laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x);
 }
 
 

src/tr1/laguerrel.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/laguerre.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_laguerrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_laguerrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::laguerre BOOST_PREVENT_MACRO_SUBSTITUTION(n, x);
+   return c_policies::laguerre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x);
 }
 
 

src/tr1/legendre.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/legendre.hpp>
 #include "c_policy.hpp"
 
-extern "C" double BOOST_MATH_TR1_DECL boost_legendre BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_legendre BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::legendre_p BOOST_PREVENT_MACRO_SUBSTITUTION(n, x);
+   return c_policies::legendre_p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x);
 }
 
 

src/tr1/legendref.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/legendre.hpp>
 #include "c_policy.hpp"
 
-extern "C" float BOOST_MATH_TR1_DECL boost_legendref BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_legendref BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::legendre_p BOOST_PREVENT_MACRO_SUBSTITUTION(n, x);
+   return c_policies::legendre_p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x);
 }
 
 

src/tr1/legendrel.cpp

@@ -11,9 +11,9 @@
 #include <boost/math/special_functions/legendre.hpp>
 #include "c_policy.hpp"
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_legendrel BOOST_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_legendrel BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(unsigned n, long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::legendre_p BOOST_PREVENT_MACRO_SUBSTITUTION(n, x);
+   return c_policies::legendre_p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(n, x);
 }
 
 

src/tr1/lgamma.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" double BOOST_MATH_TR1_DECL boost_lgamma BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_lgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::lgamma BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::lgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 }}}

src/tr1/lgammaf.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" float BOOST_MATH_TR1_DECL boost_lgammaf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_lgammaf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::lgamma BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::lgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 }}}

src/tr1/lgammal.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_lgammal BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_lgammal BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::lgamma BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::lgamma BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 }}}

src/tr1/llround.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" long long BOOST_MATH_TR1_DECL boost_llround BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long long BOOST_MATH_TR1_DECL boost_llround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::llround BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::llround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 }}}

src/tr1/llroundf.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" long long BOOST_MATH_TR1_DECL boost_llroundf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long long BOOST_MATH_TR1_DECL boost_llroundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::llround BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::llround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 }}}

src/tr1/llroundl.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" long long BOOST_MATH_TR1_DECL boost_llroundl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long long BOOST_MATH_TR1_DECL boost_llroundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::llround BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::llround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 }}}

src/tr1/log1p.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" double BOOST_MATH_TR1_DECL boost_log1p BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" double BOOST_MATH_TR1_DECL boost_log1p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::log1p BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::log1p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 }}}

src/tr1/log1pf.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" float BOOST_MATH_TR1_DECL boost_log1pf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" float BOOST_MATH_TR1_DECL boost_log1pf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::log1p BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::log1p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 }}}

src/tr1/log1pl.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" long double BOOST_MATH_TR1_DECL boost_log1pl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long double BOOST_MATH_TR1_DECL boost_log1pl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::log1p BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::log1p BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 }}}

src/tr1/lround.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" long BOOST_MATH_TR1_DECL boost_lround BOOST_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long BOOST_MATH_TR1_DECL boost_lround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::lround BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::lround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 }}}

src/tr1/lroundf.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" long BOOST_MATH_TR1_DECL boost_lroundf BOOST_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long BOOST_MATH_TR1_DECL boost_lroundf BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(float x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::lround BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::lround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 }}}

src/tr1/lroundl.cpp

@@ -13,9 +13,9 @@
 
 namespace boost{ namespace math{ namespace tr1{
 
-extern "C" long BOOST_MATH_TR1_DECL boost_lroundl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
+extern "C" long BOOST_MATH_TR1_DECL boost_lroundl BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(long double x) BOOST_MATH_C99_THROW_SPEC
 {
-   return c_policies::lround BOOST_PREVENT_MACRO_SUBSTITUTION(x);
+   return c_policies::lround BOOST_MATH_PREVENT_MACRO_SUBSTITUTION(x);
 }
 
 }}}