|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r82704 - trunk/boost/gil/extension/dynamic_image
From: chhenning_at_[hidden]
Date: 2013-02-06 20:24:52
Author: chhenning
Date: 2013-02-03 15:14:05 EST (Sun, 03 Feb 2013)
New Revision: 82704
URL: http://svn.boost.org/trac/boost/changeset/82704
Log:
#6681
Text files modified:
trunk/boost/gil/extension/dynamic_image/any_image.hpp | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
Modified: trunk/boost/gil/extension/dynamic_image/any_image.hpp
==============================================================================
--- trunk/boost/gil/extension/dynamic_image/any_image.hpp (original)
+++ trunk/boost/gil/extension/dynamic_image/any_image.hpp 2013-02-03 15:14:05 EST (Sun, 03 Feb 2013)
@@ -29,6 +29,11 @@
//#pragma warning(disable : 4244) // conversion from 'std::ptrdiff_t' to 'int', possible loss of data. even if we static-assert the two types are the same (on visual studio 8)
//#endif
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#pragma warning(push)
+#pragma warning(disable:4512) //assignment operator could not be generated
+#endif
+
namespace boost { namespace gil {
namespace detail {
@@ -120,6 +125,10 @@
} } // namespace boost::gil
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#pragma warning(pop)
+#endif
+
//#ifdef _MSC_VER
//#pragma warning(pop)
//#endif
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk