We require MSVC2013 (_MSC_VER == 1800) now

Change-Id: Ice8504041f22e00f2e5010813d9dff1d2987c8d6

2 files changed, 3 insertions, 21 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_;
diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index 563ed57a2c6d..62cdb77aab1b 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -74,27 +74,18 @@ template< typename T > inline StreamIgnore operator <<(
     SAL_UNUSED_PARAMETER StreamStart const &, SAL_UNUSED_PARAMETER T const &)
 {
     std::abort();
-#if defined _MSC_VER && _MSC_VER < 1700
-    return StreamIgnore();
-#endif
 }
 
 template< typename T > inline StreamIgnore operator <<(
     SAL_UNUSED_PARAMETER StreamString const &, SAL_UNUSED_PARAMETER T const &)
 {
     std::abort();
-#if defined _MSC_VER && _MSC_VER < 1700
-    return StreamIgnore();
-#endif
 }
 
 template< typename T > inline StreamIgnore operator <<(
     SAL_UNUSED_PARAMETER StreamIgnore const &, SAL_UNUSED_PARAMETER T const &)
 {
     std::abort();
-#if defined _MSC_VER && _MSC_VER < 1700
-    return StreamIgnore();
-#endif
 }
 
 template< typename T > typename T::Result getResult(T const &);
@@ -103,9 +94,6 @@ inline char const * unwrapStream(StreamString const & s) { return s.string; }
 
 inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) {
     std::abort();
-#if defined _MSC_VER && _MSC_VER < 1700
-    return 0;
-#endif
 }
 
 } }