Kaydet (Commit) 37a04c46 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

warning C4521: multiple copy constructors specified

Change-Id: I1b28b6d18e33b85e335ca24e717e3eef7077cf8f
üst 01e6e93e
...@@ -363,6 +363,10 @@ protected: ...@@ -363,6 +363,10 @@ protected:
* *
* @param reference_type must be a subclass of vcl::Window * @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> template <class reference_type>
class ScopedVclPtrInstance : public ScopedVclPtr<reference_type> class ScopedVclPtrInstance : public ScopedVclPtr<reference_type>
{ {
...@@ -387,6 +391,9 @@ private: ...@@ -387,6 +391,9 @@ private:
ScopedVclPtrInstance(ScopedVclPtrInstance &) = delete; ScopedVclPtrInstance(ScopedVclPtrInstance &) = delete;
ScopedVclPtrInstance(ScopedVclPtrInstance const &) = delete; ScopedVclPtrInstance(ScopedVclPtrInstance const &) = delete;
}; };
#if defined _MSC_VER
#pragma warning(pop)
#endif
#endif // INCLUDED_VCL_PTR_HXX #endif // INCLUDED_VCL_PTR_HXX
......
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