[Libreoffice-commits] core.git: sdext/source

[Michael Stahl]

 sdext/source/pdfimport/pdfparse/pdfparse.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit ebbae6a1f5e183953baac8e9a9d5b0bd2f333fbe
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Feb 15 20:24:11 2018 +0100

    sdext: MSVC 2015 is trash
    
    Change-Id: I8549b52417520c0fe52977137fc570d65b0800fc

diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 5d69d767aa97..e8636a4a2dab 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -21,10 +21,9 @@
 #include <pdfparse.hxx>
 
 // boost using obsolete stuff
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER >= 1900
 #pragma warning(push)
 #pragma warning(disable:4996)
-#pragma warning(disable:4503)
 #endif
 
 // workaround windows compiler: do not include multi_pass.hpp
@@ -678,9 +677,8 @@ PDFEntry* PDFReader::read( const char* pFileName )
 #endif // WIN32
 }
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER >= 1900
 #pragma warning(pop)
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */