From 3c9baded80c4300fff5fe671e60b3c44ed96cc6c Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Wed, 28 Aug 2013 13:38:52 +0200 Subject: [PATCH] replace BOOST_STATIC_ASSERT by C++-2011's static_assert --- opm/core/utility/Average.hpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/opm/core/utility/Average.hpp b/opm/core/utility/Average.hpp index 7e3118e5..1e6affd3 100644 --- a/opm/core/utility/Average.hpp +++ b/opm/core/utility/Average.hpp @@ -37,7 +37,6 @@ #define OPM_AVERAGE_HEADER -#include #include #include @@ -53,7 +52,7 @@ namespace Opm { { // To avoid some user errors, we disallow taking averages of // integral values. - BOOST_STATIC_ASSERT(boost::is_integral::value == false); + static_assert(boost::is_integral::value == false, ""); Tresult retval(t1); retval += t2; retval *= 0.5; @@ -71,7 +70,7 @@ namespace Opm { { // To avoid some user errors, we disallow taking averages of // integral values. - BOOST_STATIC_ASSERT(boost::is_integral::value == false); + static_assert(boost::is_integral::value == false, ""); return std::sqrt(t1*t2); } @@ -84,7 +83,7 @@ namespace Opm { { // To avoid some user errors, we disallow taking averages of // integral values. - BOOST_STATIC_ASSERT(boost::is_integral::value == false); + static_assert(boost::is_integral::value == false, ""); return (2*t1*t2)/(t1 + t2); }