From 97a6a32cb9015b9931a5b1280cb1be9843e88b7c Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 23 Jan 2014 12:39:52 +0000 Subject: [PATCH] Apply patch to fix 7181 --- include/boost/phoenix/core/actor.hpp | 2 ++ include/boost/phoenix/support/vector.hpp | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/boost/phoenix/core/actor.hpp b/include/boost/phoenix/core/actor.hpp index f2b47de..9a8d7eb 100644 --- a/include/boost/phoenix/core/actor.hpp +++ b/include/boost/phoenix/core/actor.hpp @@ -29,6 +29,8 @@ #ifdef BOOST_MSVC #pragma warning(push) #pragma warning(disable: 4522) // 'this' used in base member initializer list +#pragma warning(disable: 4510) // default constructor could not be generated +#pragma warning(disable: 4610) // can never be instantiated - user defined constructor required #endif namespace boost { namespace phoenix diff --git a/include/boost/phoenix/support/vector.hpp b/include/boost/phoenix/support/vector.hpp index 82ec6af..6899d85 100644 --- a/include/boost/phoenix/support/vector.hpp +++ b/include/boost/phoenix/support/vector.hpp @@ -1,3 +1,9 @@ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4512) // assignment operator could not be generated +#pragma warning(disable: 4510) // default constructor could not be generated +#pragma warning(disable: 4610) // can never be instantiated - user defined constructor required +#endif #if !defined(BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES) #ifndef BOOST_PHOENIX_SUPPORT_VECTOR_HPP @@ -132,3 +138,7 @@ BOOST_FUSION_ADAPT_TPL_STRUCT_NO_PARTIAL( #endif #endif + +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif