OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace boost::is_integral by std::is_integral

Browse Source
This commit is contained in:
Andreas Lauser
2013-09-03 13:53:44 +02:00
parent 3c9baded80
commit 7a5a725f25
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/core/utility/Average.hpp
View File

@@ -37,7 +37,7 @@
#define OPM_AVERAGE_HEADER
#include <boost/type_traits.hpp>
#include <type_traits>
#include <cmath>
namespace Opm {
@@ -52,7 +52,7 @@ namespace Opm {
{
// To avoid some user errors, we disallow taking averages of
// integral values.
static_assert(boost::is_integral<T>::value == false, "");
static_assert(std::is_integral<T>::value == false, "");
Tresult retval(t1);
retval += t2;
retval *= 0.5;
@@ -70,7 +70,7 @@ namespace Opm {
{
// To avoid some user errors, we disallow taking averages of
// integral values.
static_assert(boost::is_integral<T>::value == false, "");
static_assert(std::is_integral<T>::value == false, "");
return std::sqrt(t1*t2);
}
@@ -83,7 +83,7 @@ namespace Opm {
{
// To avoid some user errors, we disallow taking averages of
// integral values.
static_assert(boost::is_integral<T>::value == false, "");
static_assert(std::is_integral<T>::value == false, "");
return (2*t1*t2)/(t1 + t2);
}