Branch for Iostreams development

[SVN r42144]
Cast to base added to avoid a call to the convertir constructor/assignment (see Tickes 1419 and 1420)
2007-12-18 20:08:11 +00:00 · 2007-11-25 20:26:14 +00:00
1 changed files with 2 additions and 2 deletions
--- a/include/boost/optional/optional.hpp
+++ b/include/boost/optional/optional.hpp
@ -516,7 +516,7 @@ class optional : public optional_detail::optional_base<T>

    // Creates a deep copy of another optional<T>
    // Can throw if T::T(T const&) does
-    optional ( optional const& rhs ) : base(rhs) {}
+    optional ( optional const& rhs ) : base( static_cast<base const&>(rhs) ) {}

   // No-throw (assuming T::~T() doesn't)
    ~optional() {}
@ -550,7 +550,7 @@ class optional : public optional_detail::optional_base<T>
    //  (NOTE: On BCB, this operator is not actually called and left is left UNMODIFIED in case of a throw)
    optional& operator= ( optional const& rhs )
      {
-        this->assign( rhs ) ;
+        this->assign( static_cast<base const&>(rhs) ) ;
        return *this ;
      }
Author	SHA1	Message	Date
Jonathan Turkanis	09c4e3ee2b	Branch for Iostreams development [SVN r42144]	2007-12-18 20:08:11 +00:00
Fernando Cacciola	95c864e119	Cast to base added to avoid a call to the convertir constructor/assignment (see Tickes 1419 and 1420) [SVN r41381]	2007-11-25 20:26:14 +00:00