From a251fe4d48237a4d9c9530dafc7bbdce6028e9cf Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 19 Mar 2015 10:57:17 +0200 Subject: We require MSVC2013 (_MSC_VER == 1800) now Change-Id: Ice8504041f22e00f2e5010813d9dff1d2987c8d6 --- include/o3tl/typed_flags_set.hxx | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'include/o3tl') diff --git a/include/o3tl/typed_flags_set.hxx b/include/o3tl/typed_flags_set.hxx index 4b6e4f5909b1..3e960035b61e 100644 --- a/include/o3tl/typed_flags_set.hxx +++ b/include/o3tl/typed_flags_set.hxx @@ -58,15 +58,9 @@ struct is_typed_flags { operator E() { return static_cast(value_); } -#if !defined _MSC_VER || _MSC_VER > 1700 - explicit -#endif - operator typename underlying_type::type() { return value_; } - -#if !defined _MSC_VER || _MSC_VER > 1700 - explicit -#endif - operator bool() { return value_ != 0; } + explicit operator typename underlying_type::type() { return value_; } + + explicit operator bool() { return value_ != 0; } private: typename underlying_type::type value_; -- cgit v1.2.3