Merged fixes from trunk to branch

[SVN r22011]
2004-01-27 20:08:48 +00:00
parent 54264de8f8
commit 64e32e651f
1 changed files with 1 additions and 1 deletions
--- a/include/boost/optional.hpp
+++ b/include/boost/optional.hpp
@ -426,7 +426,7 @@ class optional : public optional_detail::optional_base<T>
    // No-throw (assuming T::~T() doesn't)
    ~optional() {}

-#ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
+#if !defined(BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT) && !defined(BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION)
    // Assigns from an expression. See corresponding constructor.
    // Basic Guarantee: If the resolved T ctor throws, this is left UNINITIALIZED
    template<class Expr>