Kaydet (Commit) 50661996 authored tarafından David Ostrovsky's avatar David Ostrovsky

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/18328Reviewed-by: 's avatarDavid Ostrovsky <david@ostrovsky.org>
Tested-by: 's avatarDavid Ostrovsky <david@ostrovsky.org>
üst 4a8883e8
...@@ -220,6 +220,10 @@ protected: ...@@ -220,6 +220,10 @@ protected:
/** This dummy default c'tor will never call the c'tor of the virtual base /** This dummy default c'tor will never call the c'tor of the virtual base
class BinaryStreamBase as this class cannot be instantiated directly. */ class BinaryStreamBase as this class cannot be instantiated directly. */
BinaryInputStream() : BinaryStreamBase( false ) {} BinaryInputStream() : BinaryStreamBase( false ) {}
private:
BinaryInputStream( BinaryInputStream const& ) = delete;
BinaryInputStream& operator=( BinaryInputStream const& ) = delete;
}; };
typedef std::shared_ptr< BinaryInputStream > BinaryInputStreamRef; typedef std::shared_ptr< BinaryInputStream > BinaryInputStreamRef;
......
...@@ -86,6 +86,10 @@ protected: ...@@ -86,6 +86,10 @@ protected:
/** This dummy default c'tor will never call the c'tor of the virtual base /** This dummy default c'tor will never call the c'tor of the virtual base
class BinaryStreamBase as this class cannot be instantiated directly. */ class BinaryStreamBase as this class cannot be instantiated directly. */
BinaryOutputStream() : BinaryStreamBase( false ) {} BinaryOutputStream() : BinaryStreamBase( false ) {}
private:
BinaryOutputStream( BinaryOutputStream const& ) = delete;
BinaryOutputStream& operator=( BinaryOutputStream const& ) = delete;
}; };
template< typename Type > template< typename Type >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment