From ad5275ca7847b8f32c719dd0bc3e9b55ed5973c2 Mon Sep 17 00:00:00 2001 From: Steve Brain Date: Tue, 13 Sep 2016 16:07:34 +1000 Subject: [PATCH] Added inline to fix compilation warnings on msvc 2013 --- gsl/gsl_byte | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gsl/gsl_byte b/gsl/gsl_byte index 5134032..8f57f67 100644 --- a/gsl/gsl_byte +++ b/gsl/gsl_byte @@ -26,7 +26,7 @@ // constexpr is not understood #pragma push_macro("constexpr") -#define constexpr /*constexpr*/ +#define constexpr /*constexpr*/ // noexcept is not understood #pragma push_macro("noexcept") @@ -68,37 +68,37 @@ constexpr byte operator>>(byte b, IntegerType shift) noexcept return byte(static_cast(b) >> shift); } -constexpr byte& operator|=(byte& l, byte r) noexcept +inline constexpr byte& operator|=(byte& l, byte r) noexcept { return l = byte(static_cast(l) | static_cast(r)); } -constexpr byte operator|(byte l, byte r) noexcept +inline constexpr byte operator|(byte l, byte r) noexcept { return byte(static_cast(l) | static_cast(r)); } -constexpr byte& operator&=(byte& l, byte r) noexcept +inline constexpr byte& operator&=(byte& l, byte r) noexcept { return l = byte(static_cast(l) & static_cast(r)); } -constexpr byte operator&(byte l, byte r) noexcept +inline constexpr byte operator&(byte l, byte r) noexcept { return byte(static_cast(l) & static_cast(r)); } -constexpr byte& operator^=(byte& l, byte r) noexcept +inline constexpr byte& operator^=(byte& l, byte r) noexcept { return l = byte(static_cast(l) ^ static_cast(r)); } -constexpr byte operator^(byte l, byte r) noexcept +inline constexpr byte operator^(byte l, byte r) noexcept { return byte(static_cast(l) ^ static_cast(r)); } -constexpr byte operator~(byte b) noexcept { return byte(~static_cast(b)); } +inline constexpr byte operator~(byte b) noexcept { return byte(~static_cast(b)); } template ::value>> constexpr IntegerType to_integer(byte b) noexcept