diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-09-03 23:51:56 +0200 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2015-09-10 06:11:45 +0000 |
| commit | 5066199663e40aad46e769ca3372f5f0b9915789 (patch) | |
| tree | 7c6f11804f07cfb58aa27799f8f8509949c8545c /include | |
| parent | 4a8883e82720a364fc3e9a37631f02b957577d2a (diff) | |
oox: workaround C2249 error on MSVC 14.0
The member is inherited from a nonpublic virtual base class or
structure.
Declaring copy ctor and assignment operator as deleted in derived
class solved the problem.
Change-Id: Ic509f7e7311fd896656ecff80df3ece4503c3a65
Reviewed-on: https://gerrit.libreoffice.org/18328
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/helper/binaryinputstream.hxx | 4 | ||||
| -rw-r--r-- | include/oox/helper/binaryoutputstream.hxx | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index cb7fb90ce478..423af9c77ab4 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -220,6 +220,10 @@ 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. */ BinaryInputStream() : BinaryStreamBase( false ) {} + +private: + BinaryInputStream( BinaryInputStream const& ) = delete; + BinaryInputStream& operator=( BinaryInputStream const& ) = delete; }; typedef std::shared_ptr< BinaryInputStream > BinaryInputStreamRef; diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx index 52160dae396b..49eb7e7e1cc1 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -86,6 +86,10 @@ 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. */ BinaryOutputStream() : BinaryStreamBase( false ) {} + +private: + BinaryOutputStream( BinaryOutputStream const& ) = delete; + BinaryOutputStream& operator=( BinaryOutputStream const& ) = delete; }; template< typename Type > |