|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r49141 - in trunk: boost/math/distributions boost/math/special_functions libs/math/src/tr1 libs/math/test
From: john_at_[hidden]
Date: 2008-10-06 08:43:47
Author: johnmaddock
Date: 2008-10-06 08:43:46 EDT (Mon, 06 Oct 2008)
New Revision: 49141
URL: http://svn.boost.org/trac/boost/changeset/49141
Log:
Fixes for Sun C++ on Linux.
Text files modified:
trunk/boost/math/distributions/non_central_f.hpp | 5 +++--
trunk/boost/math/special_functions/expint.hpp | 3 ++-
trunk/libs/math/src/tr1/llround.cpp | 5 +++++
trunk/libs/math/src/tr1/llroundf.cpp | 6 ++++++
trunk/libs/math/src/tr1/llroundl.cpp | 5 +++++
trunk/libs/math/test/Jamfile.v2 | 1 +
6 files changed, 22 insertions(+), 3 deletions(-)
Modified: trunk/boost/math/distributions/non_central_f.hpp
==============================================================================
--- trunk/boost/math/distributions/non_central_f.hpp (original)
+++ trunk/boost/math/distributions/non_central_f.hpp 2008-10-06 08:43:46 EDT (Mon, 06 Oct 2008)
@@ -12,6 +12,7 @@
#include <boost/math/distributions/non_central_beta.hpp>
#include <boost/math/distributions/detail/generic_mode.hpp>
+#include <boost/math/special_functions/pow.hpp>
namespace boost
{
@@ -253,8 +254,8 @@
+ 4 * (10 + m) * (-2 + m + n) * l3
+ (10 + m) * l4))
/
- ((-8 + m) * (-6 + m) * pow(n * (-2 + m + n)
- + 2 * (-2 + m + n) * l + l2, 2));
+ ((-8 + m) * (-6 + m) * boost::math::pow<2>(n * (-2 + m + n)
+ + 2 * (-2 + m + n) * l + l2));
return result;
} // kurtosis_excess
Modified: trunk/boost/math/special_functions/expint.hpp
==============================================================================
--- trunk/boost/math/special_functions/expint.hpp (original)
+++ trunk/boost/math/special_functions/expint.hpp 2008-10-06 08:43:46 EDT (Mon, 06 Oct 2008)
@@ -17,6 +17,7 @@
#include <boost/math/policies/error_handling.hpp>
#include <boost/math/special_functions/digamma.hpp>
#include <boost/math/special_functions/log1p.hpp>
+#include <boost/math/special_functions/pow.hpp>
namespace boost{ namespace math{
@@ -416,7 +417,7 @@
fact *= ++k;
}
BOOST_MATH_INSTRUMENT_VARIABLE(result)
- result += pow(-z, (int)n - 1)
+ result += pow(-z, static_cast<T>(n - 1))
* (boost::math::digamma(static_cast<T>(n)) - log(z)) / fact;
BOOST_MATH_INSTRUMENT_VARIABLE(result)
Modified: trunk/libs/math/src/tr1/llround.cpp
==============================================================================
--- trunk/libs/math/src/tr1/llround.cpp (original)
+++ trunk/libs/math/src/tr1/llround.cpp 2008-10-06 08:43:46 EDT (Mon, 06 Oct 2008)
@@ -5,6 +5,9 @@
//
#define BOOST_MATH_TR1_SOURCE
#include <boost/math/tr1.hpp>
+
+#ifdef BOOST_HAS_LONG_LONG
+
#include <boost/math/special_functions/round.hpp>
#include "c_policy.hpp"
@@ -16,3 +19,5 @@
}
}}}
+
+#endif
Modified: trunk/libs/math/src/tr1/llroundf.cpp
==============================================================================
--- trunk/libs/math/src/tr1/llroundf.cpp (original)
+++ trunk/libs/math/src/tr1/llroundf.cpp 2008-10-06 08:43:46 EDT (Mon, 06 Oct 2008)
@@ -5,6 +5,9 @@
//
#define BOOST_MATH_TR1_SOURCE
#include <boost/math/tr1.hpp>
+
+#ifdef BOOST_HAS_LONG_LONG
+
#include <boost/math/special_functions/round.hpp>
#include "c_policy.hpp"
@@ -16,3 +19,6 @@
}
}}}
+
+#endif
+
Modified: trunk/libs/math/src/tr1/llroundl.cpp
==============================================================================
--- trunk/libs/math/src/tr1/llroundl.cpp (original)
+++ trunk/libs/math/src/tr1/llroundl.cpp 2008-10-06 08:43:46 EDT (Mon, 06 Oct 2008)
@@ -5,6 +5,9 @@
//
#define BOOST_MATH_TR1_SOURCE
#include <boost/math/tr1.hpp>
+
+#ifdef BOOST_HAS_LONG_LONG
+
#include <boost/math/special_functions/round.hpp>
#include "c_policy.hpp"
@@ -16,3 +19,5 @@
}
}}}
+
+#endif
Modified: trunk/libs/math/test/Jamfile.v2
==============================================================================
--- trunk/libs/math/test/Jamfile.v2 (original)
+++ trunk/libs/math/test/Jamfile.v2 2008-10-06 08:43:46 EDT (Mon, 06 Oct 2008)
@@ -34,6 +34,7 @@
# Sunpro has problems building regex as a shared lib:
<toolset>sun:<link>static
<define>BOOST_ALL_NO_LIB=1
+ <define>BOOST_UBLAS_UNSUPPORTED_COMPILER=0
;
run hypot_test.cpp ;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk