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

[Mike Kaganski]

 include/oox/helper/binaryinputstream.hxx  |    7 -------
 include/oox/helper/binaryoutputstream.hxx |    7 -------
 2 files changed, 14 deletions(-)

New commits:
commit a584c0a27de9cbd81bc1a6e502868ffc52cc67ad
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 20:43:37 2018 +0300

    oox: MSVC: pragma warning: make more specific, remove obsolete
    
    Change-Id: I3b3f46be30fce0f9193ee8d52159b16d022d903f
    Reviewed-on: https://gerrit.libreoffice.org/49039
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 905b7d3bbac3..c6b59459f0d8 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -193,14 +193,7 @@ public:
 protected:
     /** This dummy default c'tor will never call the c'tor of the virtual base
         class BinaryStreamBase as this class cannot be instantiated directly. */
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning( disable : 4702)
-#endif
     BinaryInputStream() : BinaryStreamBase( false ) {}
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 private:
     BinaryInputStream( BinaryInputStream const& ) = delete;
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 21f563227fd8..fe0ce9ae34c5 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -90,14 +90,7 @@ public:
 protected:
     /** This dummy default c'tor will never call the c'tor of the virtual base
         class BinaryStreamBase as this class cannot be instantiated directly. */
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning( disable : 4702)
-#endif
     BinaryOutputStream() : BinaryStreamBase( false ) {}
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 private:
     BinaryOutputStream( BinaryOutputStream const& ) = delete;