Change assertions in operator* to match documentation; improves codeg…

…en slightly in the result<U&> case
boostorg · Feb 24, 2025 · 7a49a5d · 7a49a5d
1 parent a0597f4
commit 7a49a5d
Showing 1 changed file with 10 additions and 25 deletions.
diff --git a/include/boost/system/result.hpp b/include/boost/system/result.hpp
@@ -332,40 +332,28 @@ template<class T, class E = error_code> class result
 
     BOOST_CXX14_CONSTEXPR T& operator*() noexcept
     {
-        T* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
     }
 
     BOOST_CXX14_CONSTEXPR T const& operator*() const noexcept
     {
-        T const* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
     }
 
 #else
 
     BOOST_CXX14_CONSTEXPR T& operator*() & noexcept
     {
-        T* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
     }
 
     BOOST_CXX14_CONSTEXPR T const& operator*() const & noexcept
     {
-        T const* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
     }
 
     template<class U = T>
@@ -838,11 +826,8 @@ template<class U, class E> class result<U&, E>
 
     BOOST_CXX14_CONSTEXPR U& operator*() const noexcept
     {
-        U* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
     }
 
     // error access