[Libreoffice-commits] core.git: include/o3tl

[Stephan Bergmann]

 include/o3tl/safeint.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2685678cd0221f4522e8502183baeaecb5ddd0a4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 12 14:34:10 2017 +0200

    Revert "Work around clang-cl issue with MSVC's safeint.h for now"
    
    This reverts commit acbb7e3243afec515bf98b2b34454afc5320bf66.  No longer needed
    with safeint.h from recent "Windows Software Development Kit - Windows
    10.0.15063.137".

diff --git a/include/o3tl/safeint.hxx b/include/o3tl/safeint.hxx
index e4eee64ff2fd..ce144d22d9ea 100644
--- a/include/o3tl/safeint.hxx
+++ b/include/o3tl/safeint.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_O3TL_SAFEINT_HXX
 
 #include <limits>
-#if defined(_MSC_VER) && !defined __clang__
+#if defined(_MSC_VER)
 #include <safeint.h>
 #else
 #ifndef __has_builtin
@@ -22,7 +22,7 @@
 namespace o3tl
 {
 
-#if defined(_MSC_VER) && !defined __clang__
+#if defined(_MSC_VER)
 
 template<typename T> inline bool checked_multiply(T a, T b, T& result)
 {