[mlpack-git] master: Removes _BACKPORT, includes backported files before boost files (2ec2846)

gitdub at mlpack.org gitdub at mlpack.org
Thu Jul 21 08:15:34 EDT 2016 

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

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

commit 2ec2846b2622c3db547d19bd5601a7323baa1609
Author: Yannis Mentekidis <mentekid at gmail.com>
Date:   Thu Jul 21 13:15:34 2016 +0100

    Removes _BACKPORT, includes backported files before boost files


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

2ec2846b2622c3db547d19bd5601a7323baa1609
 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           | 8 ++++----
 src/mlpack/core/boost_backport/detail/unchecked_bernoulli.hpp | 6 +++---
 src/mlpack/core/boost_backport/math_fwd.hpp                   | 6 +++---
 src/mlpack/core/boost_backport/policy.hpp                     | 4 ++--
 src/mlpack/core/boost_backport/polygamma.hpp                  | 6 +++---
 src/mlpack/core/boost_backport/trigamma.hpp                   | 6 +++---
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/mlpack/core/boost_backport/bernoulli.hpp b/src/mlpack/core/boost_backport/bernoulli.hpp
index 478b9dc..5542970 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_BACKPORT_
-#define _BOOST_BERNOULLI_B2N_2013_05_30_HPP_BACKPORT_
+#ifndef _BOOST_BERNOULLI_B2N_2013_05_30_HPP_
+#define _BOOST_BERNOULLI_B2N_2013_05_30_HPP_
 
 #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 cce30c5..f26dfe7 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_BACKPORT
-#define BOOST_MATH_BERNOULLI_DETAIL_HPP_BACKPORT
+#ifndef BOOST_MATH_BERNOULLI_DETAIL_HPP_
+#define BOOST_MATH_BERNOULLI_DETAIL_HPP_
 
 #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 3af7950..e735d09 100644
--- a/src/mlpack/core/boost_backport/detail/polygamma.hpp
+++ b/src/mlpack/core/boost_backport/detail/polygamma.hpp
@@ -8,14 +8,14 @@
 //  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_BACKPORT_
-  #define _BOOST_POLYGAMMA_DETAIL_2013_07_30_HPP_BACKPORT_
+#ifndef _BOOST_POLYGAMMA_DETAIL_2013_07_30_HPP_
+  #define _BOOST_POLYGAMMA_DETAIL_2013_07_30_HPP_
 
+  #include "../policy.hpp"
+  #include "../bernoulli.hpp"
   #include <cmath>
   #include <limits>
   #include <boost/cstdint.hpp>
-  #include "../policy.hpp"
-  #include "../bernoulli.hpp"
   #include <boost/math/special_functions/trunc.hpp>
   #include <boost/math/special_functions/zeta.hpp>
   #include <boost/math/special_functions/digamma.hpp>
diff --git a/src/mlpack/core/boost_backport/detail/unchecked_bernoulli.hpp b/src/mlpack/core/boost_backport/detail/unchecked_bernoulli.hpp
index caf41d2..80801bd 100644
--- a/src/mlpack/core/boost_backport/detail/unchecked_bernoulli.hpp
+++ b/src/mlpack/core/boost_backport/detail/unchecked_bernoulli.hpp
@@ -8,14 +8,14 @@
 //  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_BACKPORT
-#define BOOST_MATH_UNCHECKED_BERNOULLI_HPP_BACKPORT
+#ifndef BOOST_MATH_UNCHECKED_BERNOULLI_HPP_
+#define BOOST_MATH_UNCHECKED_BERNOULLI_HPP_
 
+#include "../math_fwd.hpp"
 #include <limits>
 #include <cmath>
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/constants/constants.hpp>
-#include "../math_fwd.hpp"
 #include <boost/mpl/int.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 
diff --git a/src/mlpack/core/boost_backport/math_fwd.hpp b/src/mlpack/core/boost_backport/math_fwd.hpp
index 202324b..d9eff24 100644
--- a/src/mlpack/core/boost_backport/math_fwd.hpp
+++ b/src/mlpack/core/boost_backport/math_fwd.hpp
@@ -16,16 +16,16 @@
 // 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_BACKPORT
-#define BOOST_MATH_SPECIAL_MATH_FWD_HPP_BACKPORT
+#ifndef BOOST_MATH_SPECIAL_MATH_FWD_HPP
+#define BOOST_MATH_SPECIAL_MATH_FWD_HPP
 
 #ifdef _MSC_VER
 #pragma once
 #endif
 
+#include "policy.hpp"
 #include <boost/math/special_functions/detail/round_fwd.hpp>
 #include <boost/math/tools/promotion.hpp> // for argument promotion.
-#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 8c24e69..5cd2534 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_BACKPORT
-#define BOOST_MATH_POLICY_HPP_BACKPORT
+#ifndef BOOST_MATH_POLICY_HPP_
+#define BOOST_MATH_POLICY_HPP_
 
 #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 174c045..482796f 100644
--- a/src/mlpack/core/boost_backport/polygamma.hpp
+++ b/src/mlpack/core/boost_backport/polygamma.hpp
@@ -8,12 +8,12 @@
 //  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_BACKPORT_
-  #define _BOOST_POLYGAMMA_2013_07_30_HPP_BACKPORT_
+#ifndef _BOOST_POLYGAMMA_2013_07_30_HPP_
+  #define _BOOST_POLYGAMMA_2013_07_30_HPP_
 
-#include <boost/math/special_functions/factorials.hpp>
 #include "detail/polygamma.hpp"
 #include "trigamma.hpp"
+#include <boost/math/special_functions/factorials.hpp>
 
 // Forward declarations
 namespace boost { namespace math {
diff --git a/src/mlpack/core/boost_backport/trigamma.hpp b/src/mlpack/core/boost_backport/trigamma.hpp
index 0dcef88..17628db 100644
--- a/src/mlpack/core/boost_backport/trigamma.hpp
+++ b/src/mlpack/core/boost_backport/trigamma.hpp
@@ -3,14 +3,15 @@
 //  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_BACKPORT
-#define BOOST_MATH_SF_TRIGAMMA_HPP_BACKPORT
+#ifndef BOOST_MATH_SF_TRIGAMMA_HPP_
+#define BOOST_MATH_SF_TRIGAMMA_HPP_
 
 #ifdef _MSC_VER
 #pragma once
 #endif
 
 #include "math_fwd.hpp"
+#include "polygamma.hpp"
 #include <boost/math/tools/rational.hpp>
 #include <boost/math/tools/series.hpp>
 #include <boost/math/tools/promotion.hpp>
@@ -18,7 +19,6 @@
 #include <boost/math/constants/constants.hpp>
 #include <boost/mpl/comparison.hpp>
 #include <boost/math/tools/big_constant.hpp>
-#include "polygamma.hpp"
 
 namespace boost{
 namespace math{

More information about the mlpack-git mailing list