boost/phoenix
2
0
Fork 0
mirror of https://github.com/boostorg/phoenix.git synced 2026-02-19 14:42:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix7181' into develop

Browse Source
This commit is contained in:
John Fletcher
2014-01-23 12:41:10 +00:00
parent 07c55f69f4 97a6a32cb9
commit 439c5b4ee0
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/phoenix/core/actor.hpp
View File

@@ -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

10
include/boost/phoenix/support/vector.hpp
View File

@@ -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