diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-09-04 12:40:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-09-04 12:40:07 +0200 |
| commit | 37a04c46c5de7c114159dbf10183db790d795ce8 (patch) | |
| tree | a4505a5c60107eb2bc47fee7a09dc5182eb4f78f /include | |
| parent | 01e6e93eed5efc22aa7818f50807ec68a4a3aa52 (diff) | |
warning C4521: multiple copy constructors specified
Change-Id: I1b28b6d18e33b85e335ca24e717e3eef7077cf8f
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/vclptr.hxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx index 407db34f67b5..6618ec20ae87 100644 --- a/include/vcl/vclptr.hxx +++ b/include/vcl/vclptr.hxx @@ -363,6 +363,10 @@ protected: * * @param reference_type must be a subclass of vcl::Window */ +#if defined _MSC_VER +#pragma warning(push) +#pragma warning(disable: 4521) // " multiple copy constructors specified" +#endif template <class reference_type> class ScopedVclPtrInstance : public ScopedVclPtr<reference_type> { @@ -387,6 +391,9 @@ private: ScopedVclPtrInstance(ScopedVclPtrInstance &) = delete; ScopedVclPtrInstance(ScopedVclPtrInstance const &) = delete; }; +#if defined _MSC_VER +#pragma warning(pop) +#endif #endif // INCLUDED_VCL_PTR_HXX |