[mlpack-git] master: Adds '_BACKPORT' to all ifndef shields (cd3f4a0)

gitdub at mlpack.org gitdub at mlpack.org
Thu Jul 21 07:46:21 EDT 2016


Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/ba850f782a53c5a77b7985f7647f609bd96cb5e7...2c026d838925df436d967439899813da5d34c702

>---------------------------------------------------------------

commit cd3f4a0cde41e2fa6fb5258bba0a71982bb92829
Author: Yannis Mentekidis <mentekid at gmail.com>
Date:   Thu Jul 21 12:46:21 2016 +0100

    Adds '_BACKPORT' to all ifndef shields


>---------------------------------------------------------------

cd3f4a0cde41e2fa6fb5258bba0a71982bb92829
 src/mlpack/core/boost_backport/bernoulli.hpp                  |  4 ++--
 src/mlpack/core/boost_backport/detail/bernoulli_details.hpp   |  4 ++--
 src/mlpack/core/boost_backport/detail/polygamma.hpp           | 10 ++--------
 src/mlpack/core/boost_backport/detail/unchecked_bernoulli.hpp |  4 ++--
 src/mlpack/core/boost_backport/math_fwd.hpp                   |  6 +++---
 src/mlpack/core/boost_backport/policy.hpp                     |  4 ++--
 src/mlpack/core/boost_backport/polygamma.hpp                  |  5 ++---
 src/mlpack/core/boost_backport/trigamma.hpp                   |  4 ++--
 8 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/mlpack/core/boost_backport/bernoulli.hpp b/src/mlpack/core/boost_backport/bernoulli.hpp
index 5542970..478b9dc 100644
--- a/src/mlpack/core/boost_backport/bernoulli.hpp
+++ b/src/mlpack/core/boost_backport/bernoulli.hpp
@@ -8,8 +8,8 @@
 //  Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef _BOOST_BERNOULLI_B2N_2013_05_30_HPP_
-#define _BOOST_BERNOULLI_B2N_2013_05_30_HPP_
+#ifndef _BOOST_BERNOULLI_B2N_2013_05_30_HPP_BACKPORT_
+#define _BOOST_BERNOULLI_B2N_2013_05_30_HPP_BACKPORT_
 
 #include "math_fwd.hpp"
 
diff --git a/src/mlpack/core/boost_backport/detail/bernoulli_details.hpp b/src/mlpack/core/boost_backport/detail/bernoulli_details.hpp
index a167ab3..cce30c5 100644
--- a/src/mlpack/core/boost_backport/detail/bernoulli_details.hpp
+++ b/src/mlpack/core/boost_backport/detail/bernoulli_details.hpp
@@ -4,8 +4,8 @@
 //  Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_MATH_BERNOULLI_DETAIL_HPP
-#define BOOST_MATH_BERNOULLI_DETAIL_HPP
+#ifndef BOOST_MATH_BERNOULLI_DETAIL_HPP_BACKPORT
+#define BOOST_MATH_BERNOULLI_DETAIL_HPP_BACKPORT
 
 #include "../math_fwd.hpp"
 #include <boost/config.hpp>
diff --git a/src/mlpack/core/boost_backport/detail/polygamma.hpp b/src/mlpack/core/boost_backport/detail/polygamma.hpp
index d33e334..eb53874 100644
--- a/src/mlpack/core/boost_backport/detail/polygamma.hpp
+++ b/src/mlpack/core/boost_backport/detail/polygamma.hpp
@@ -8,8 +8,8 @@
 //  Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef _BOOST_POLYGAMMA_DETAIL_2013_07_30_HPP_
-  #define _BOOST_POLYGAMMA_DETAIL_2013_07_30_HPP_
+#ifndef _BOOST_POLYGAMMA_DETAIL_2013_07_30_HPP_BACKPORT_
+  #define _BOOST_POLYGAMMA_DETAIL_2013_07_30_HPP_BACKPORT_
 
   #include <cmath>
   #include <limits>
@@ -36,12 +36,6 @@
     template<class T>
     inline typename tools::promote_args<T>::type polygamma(const int n, T x);
     
-    namespace policies{
-      // Forward declaration of boost::math::policies::digits_base10.
-      template <class T, class Policy>
-      inline BOOST_MATH_CONSTEXPR int digits_base10(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE(T));
-    }
-
   }}
   
 
diff --git a/src/mlpack/core/boost_backport/detail/unchecked_bernoulli.hpp b/src/mlpack/core/boost_backport/detail/unchecked_bernoulli.hpp
index 483e2d8..caf41d2 100644
--- a/src/mlpack/core/boost_backport/detail/unchecked_bernoulli.hpp
+++ b/src/mlpack/core/boost_backport/detail/unchecked_bernoulli.hpp
@@ -8,8 +8,8 @@
 //  Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_MATH_UNCHECKED_BERNOULLI_HPP
-#define BOOST_MATH_UNCHECKED_BERNOULLI_HPP
+#ifndef BOOST_MATH_UNCHECKED_BERNOULLI_HPP_BACKPORT
+#define BOOST_MATH_UNCHECKED_BERNOULLI_HPP_BACKPORT
 
 #include <limits>
 #include <cmath>
diff --git a/src/mlpack/core/boost_backport/math_fwd.hpp b/src/mlpack/core/boost_backport/math_fwd.hpp
index 460cf60..202324b 100644
--- a/src/mlpack/core/boost_backport/math_fwd.hpp
+++ b/src/mlpack/core/boost_backport/math_fwd.hpp
@@ -16,8 +16,8 @@
 // RT = Real type (built-in floating-point types, float, double, long double) & User Defined Types
 // AT = Integer or Real type
 
-#ifndef BOOST_MATH_SPECIAL_MATH_FWD_HPP
-#define BOOST_MATH_SPECIAL_MATH_FWD_HPP
+#ifndef BOOST_MATH_SPECIAL_MATH_FWD_HPP_BACKPORT
+#define BOOST_MATH_SPECIAL_MATH_FWD_HPP_BACKPORT
 
 #ifdef _MSC_VER
 #pragma once
@@ -25,7 +25,7 @@
 
 #include <boost/math/special_functions/detail/round_fwd.hpp>
 #include <boost/math/tools/promotion.hpp> // for argument promotion.
-#include <boost/math/policies/policy.hpp>
+#include "policy.hpp"
 #include <boost/mpl/comparison.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/config/no_tr1/complex.hpp>
diff --git a/src/mlpack/core/boost_backport/policy.hpp b/src/mlpack/core/boost_backport/policy.hpp
index 83848c5..8c24e69 100644
--- a/src/mlpack/core/boost_backport/policy.hpp
+++ b/src/mlpack/core/boost_backport/policy.hpp
@@ -3,8 +3,8 @@
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_MATH_POLICY_HPP
-#define BOOST_MATH_POLICY_HPP
+#ifndef BOOST_MATH_POLICY_HPP_BACKPORT
+#define BOOST_MATH_POLICY_HPP_BACKPORT
 
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/contains.hpp>
diff --git a/src/mlpack/core/boost_backport/polygamma.hpp b/src/mlpack/core/boost_backport/polygamma.hpp
index 49e3e3b..174c045 100644
--- a/src/mlpack/core/boost_backport/polygamma.hpp
+++ b/src/mlpack/core/boost_backport/polygamma.hpp
@@ -8,8 +8,8 @@
 //  Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef _BOOST_POLYGAMMA_2013_07_30_HPP_
-  #define _BOOST_POLYGAMMA_2013_07_30_HPP_
+#ifndef _BOOST_POLYGAMMA_2013_07_30_HPP_BACKPORT_
+  #define _BOOST_POLYGAMMA_2013_07_30_HPP_BACKPORT_
 
 #include <boost/math/special_functions/factorials.hpp>
 #include "detail/polygamma.hpp"
@@ -21,7 +21,6 @@ namespace boost { namespace math {
   inline typename tools::promote_args<T>::type 
   trigamma(T x, const Policy&);
 
-
   template <class T>
   inline typename tools::promote_args<T>::type 
   trigamma(T x);
diff --git a/src/mlpack/core/boost_backport/trigamma.hpp b/src/mlpack/core/boost_backport/trigamma.hpp
index d56c94d..0dcef88 100644
--- a/src/mlpack/core/boost_backport/trigamma.hpp
+++ b/src/mlpack/core/boost_backport/trigamma.hpp
@@ -3,8 +3,8 @@
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_MATH_SF_TRIGAMMA_HPP
-#define BOOST_MATH_SF_TRIGAMMA_HPP
+#ifndef BOOST_MATH_SF_TRIGAMMA_HPP_BACKPORT
+#define BOOST_MATH_SF_TRIGAMMA_HPP_BACKPORT
 
 #ifdef _MSC_VER
 #pragma once




More information about the mlpack-git mailing list