include/vcl/vclptr.hxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 37a04c46c5de7c114159dbf10183db790d795ce8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Sep 4 12:40:07 2015 +0200
warning C4521: multiple copy constructors specified
Change-Id: I1b28b6d18e33b85e335ca24e717e3eef7077cf8f
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 407db34..6618ec2 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
