diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-02-21 08:32:31 -0800 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-22 17:58:08 +0100 |
| commit | 2227f4f54c9070f9efdbfbf24c510eb9e3fa1364 (patch) | |
| tree | cdb39b0666de8a1ab9928a4729ed63f145b8dba4 /include | |
| parent | c344820237efee7c3c7309a9f30ff8739aa8b5b4 (diff) | |
WaE vs2015 unreacheable code
Change-Id: I11241c8653194fdb0a85727fef85f2963f9e8228
Reviewed-on: https://gerrit.libreoffice.org/22602
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit f09b79a4f016289e76af476fc8a5eb86e8f8dd92)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/helper/binaryinputstream.hxx | 7 | ||||
| -rw-r--r-- | include/oox/helper/binaryoutputstream.hxx | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 1baf584f0f75..0e4b3134993e 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -194,7 +194,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 ae5496d924fe..0ed0d5e2bfce 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -83,7 +83,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; |