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

Norbert Thiebaud nthiebaud at gmail.com
Mon Feb 22 16:57:42 UTC 2016


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

New commits:
commit f09b79a4f016289e76af476fc8a5eb86e8f8dd92
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Feb 21 08:32:31 2016 -0800

    WaE vs2015 unreacheable code
    
    Change-Id: I11241c8653194fdb0a85727fef85f2963f9e8228
    Reviewed-on: https://gerrit.libreoffice.org/22602
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index afc48d3..fba55a0 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -193,7 +193,14 @@ 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 4287441..486b4ef 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -82,7 +82,14 @@ 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;


More information about the Libreoffice-commits mailing list