diff options
Diffstat (limited to 'boost/proto/expr.hpp')
| -rw-r--r-- | boost/proto/expr.hpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/boost/proto/expr.hpp b/boost/proto/expr.hpp index cb8a28f6e9..1bd64985d8 100644 --- a/boost/proto/expr.hpp +++ b/boost/proto/expr.hpp @@ -26,7 +26,7 @@ #include <boost/proto/args.hpp> #include <boost/proto/traits.hpp> -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma warning(push) # pragma warning(disable : 4510) // default constructor could not be generated # pragma warning(disable : 4512) // assignment operator could not be generated @@ -90,6 +90,19 @@ namespace boost { namespace proto return that; } + // Work-around for: + // https://connect.microsoft.com/VisualStudio/feedback/details/765449/codegen-stack-corruption-using-runtime-checks-when-aggregate-initializing-struct + #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1700)) + template<typename T, typename Expr, typename C, typename U> + BOOST_FORCEINLINE + Expr make_terminal(T &t, Expr *, proto::term<U C::*> *) + { + Expr that; + that.child0 = t; + return that; + } + #endif + template<typename T, typename U> struct same_cv { @@ -143,7 +156,7 @@ namespace boost { namespace proto }} -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma warning(pop) #endif |