From 3f228716de8816bcba6f66bdfe63c114abdfd555 Mon Sep 17 00:00:00 2001 From: Robert Ramey Date: Tue, 11 Apr 2017 12:11:42 -0700 Subject: [PATCH] replaced instances of "constexpr inline" with simple "constexpr" since the first implies the second --- include/interval.hpp | 2 +- include/safe_base_operations.hpp | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/interval.hpp b/include/interval.hpp index 0f8fd60..0676a37 100644 --- a/include/interval.hpp +++ b/include/interval.hpp @@ -197,7 +197,7 @@ constexpr interval> multiply( // it doesn't consider the possibility that the divisor is zero. This will // have to be considered separately. template -constexpr inline interval> divide( +constexpr interval> divide( const interval & t, const interval & u ){ diff --git a/include/safe_base_operations.hpp b/include/safe_base_operations.hpp index 059102e..5566b1d 100644 --- a/include/safe_base_operations.hpp +++ b/include/safe_base_operations.hpp @@ -342,7 +342,7 @@ typename std::enable_if< , typename addition_result::type >::type -constexpr inline operator+(const T & t, const U & u){ +constexpr operator+(const T & t, const U & u){ using ar = addition_result; return ar::make( ar::return_value( @@ -360,7 +360,7 @@ typename std::enable_if< , T >::type -constexpr inline operator+=(T & t, const U & u){ +constexpr operator+=(T & t, const U & u){ t = static_cast(t + u); return t; } @@ -476,7 +476,7 @@ typename std::enable_if< , T >::type -constexpr inline operator-=(T & t, const U & u){ +constexpr operator-=(T & t, const U & u){ t = static_cast(t - u); return t; } @@ -596,7 +596,7 @@ typename std::enable_if< , T >::type -constexpr inline operator*=(T & t, const U & u){ +constexpr operator*=(T & t, const U & u){ t = static_cast(t * u); return t; } @@ -735,7 +735,7 @@ typename std::enable_if< , T >::type -constexpr inline operator/=(T & t, const U & u){ +constexpr operator/=(T & t, const U & u){ t = static_cast(t / u); return t; } @@ -859,7 +859,7 @@ typename std::enable_if< , T >::type -constexpr inline operator%=(T & t, const U & u){ +constexpr operator%=(T & t, const U & u){ t = static_cast(t % u); return t; } @@ -1047,7 +1047,7 @@ typename boost::lazy_enable_if_c< ), left_shift_result >::type -constexpr inline operator<<(const T & t, const U & u){ +constexpr operator<<(const T & t, const U & u){ // INT13-CPP // C++ standards document N4618 & 5.8.2 static_assert( @@ -1074,7 +1074,7 @@ typename std::enable_if< , T >::type -constexpr inline operator<<=(T & t, const U & u){ +constexpr operator<<=(T & t, const U & u){ t = static_cast(t << u); return t; } @@ -1157,7 +1157,7 @@ typename boost::lazy_enable_if_c< ), right_shift_result >::type -constexpr inline operator>>(const T & t, const U & u){ +constexpr operator>>(const T & t, const U & u){ // INT13-CPP static_assert( std::numeric_limits::is_integer, "shifted value must be an integer" @@ -1183,7 +1183,7 @@ typename std::enable_if< , T >::type -constexpr inline operator>>=(T & t, const U & u){ +constexpr operator>>=(T & t, const U & u){ t = static_cast(t >> u); return t; } @@ -1279,7 +1279,7 @@ typename std::enable_if< , typename bitwise_or_result::type >::type -constexpr inline operator|(const T & t, const U & u){ +constexpr operator|(const T & t, const U & u){ using bwor = bitwise_or_result; return bwor::make( bwor::return_value( @@ -1297,7 +1297,7 @@ typename std::enable_if< , T >::type -constexpr inline operator|=(T & t, const U & u){ +constexpr operator|=(T & t, const U & u){ t = static_cast(t | u); return t; } @@ -1390,7 +1390,7 @@ typename std::enable_if< , typename bitwise_and_result::type >::type -constexpr inline operator&(const T & t, const U & u){ +constexpr operator&(const T & t, const U & u){ using bwar = bitwise_and_result; return bwar::make( bwar::return_value( @@ -1408,7 +1408,7 @@ typename std::enable_if< , T >::type -constexpr inline operator&=(T & t, const U & u){ +constexpr operator&=(T & t, const U & u){ t = static_cast(t & u); return t; } @@ -1501,7 +1501,7 @@ typename std::enable_if< , typename bitwise_or_result::type >::type -constexpr inline operator^(const T & t, const U & u){ +constexpr operator^(const T & t, const U & u){ using bwxor = bitwise_or_result; return bwxor::make( bwxor::return_value( @@ -1519,7 +1519,7 @@ typename std::enable_if< , T >::type -constexpr inline operator^=(T & t, const U & u){ +constexpr operator^=(T & t, const U & u){ t = static_cast(t ^ u); return t; }