summaryrefslogtreecommitdiff
path: root/include/o3tl
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-03-19 10:57:17 +0200
committerTor Lillqvist <tml@collabora.com>2015-03-19 10:57:17 +0200
commita251fe4d48237a4d9c9530dafc7bbdce6028e9cf (patch)
treea869b336f221df414c35bdf6ce3167a29ab279f1 /include/o3tl
parentcfeeceab9ea03b5507cdb7ddb90fcc1b8b1a4e85 (diff)
We require MSVC2013 (_MSC_VER == 1800) now
Change-Id: Ice8504041f22e00f2e5010813d9dff1d2987c8d6
Diffstat (limited to 'include/o3tl')
-rw-r--r--include/o3tl/typed_flags_set.hxx12
1 files changed, 3 insertions, 9 deletions
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<E>(value_); }
-#if !defined _MSC_VER || _MSC_VER > 1700
- explicit
-#endif
- operator typename underlying_type<E>::type() { return value_; }
-
-#if !defined _MSC_VER || _MSC_VER > 1700
- explicit
-#endif
- operator bool() { return value_ != 0; }
+ explicit operator typename underlying_type<E>::type() { return value_; }
+
+ explicit operator bool() { return value_ != 0; }
private:
typename underlying_type<E>::type value_;