Introduce std11::addressof, after value now also for error (#70, thanks @DNKpp)

martinmoene · martinmoene · commit 5b5caad7cd57 · 2024-10-18T22:16:31.000+02:00
diff --git a/include/nonstd/expected.hpp b/include/nonstd/expected.hpp
@@ -614,24 +614,24 @@ class storage_t_noncopy_nonmove_impl
 
     // void construct_error( error_type const & e )
     // {
-    //     // new( &m_error ) error_type( e );
+    //     // new( std11::addressof(m_error) ) error_type( e );
     // }
 
     // void construct_error( error_type && e )
     // {
-    //     // new( &m_error ) error_type( std::move( e ) );
+    //     // new( std11::addressof(m_error) ) error_type( std::move( e ) );
     // }
 
     template< class... Args >
     void emplace_error( Args&&... args )
     {
-        new( &m_error ) error_type( std::forward<Args>(args)...);
+        new( std11::addressof(m_error) ) error_type( std::forward<Args>(args)...);
     }
 
     template< class U, class... Args >
     void emplace_error( std::initializer_list<U> il, Args&&... args )
     {
-        new( &m_error ) error_type( il, std::forward<Args>(args)... );
+        new( std11::addressof(m_error) ) error_type( il, std::forward<Args>(args)... );
     }
 
     void destruct_error()
@@ -760,24 +760,24 @@ class storage_t_impl
 
     void construct_error( error_type const & e )
     {
-        new( &m_error ) error_type( e );
+        new( std11::addressof(m_error) ) error_type( e );
     }
 
     void construct_error( error_type && e )
     {
-        new( &m_error ) error_type( std::move( e ) );
+        new( std11::addressof(m_error) ) error_type( std::move( e ) );
     }
 
     template< class... Args >
     void emplace_error( Args&&... args )
     {
-        new( &m_error ) error_type( std::forward<Args>(args)...);
+        new( std11::addressof(m_error) ) error_type( std::forward<Args>(args)...);
     }
 
     template< class U, class... Args >
     void emplace_error( std::initializer_list<U> il, Args&&... args )
     {
-        new( &m_error ) error_type( il, std::forward<Args>(args)... );
+        new( std11::addressof(m_error) ) error_type( il, std::forward<Args>(args)... );
     }
 
     void destruct_error()
@@ -876,24 +876,24 @@ struct storage_t_impl< void, E >
 
     void construct_error( error_type const & e )
     {
-        new( &m_error ) error_type( e );
+        new( std11::addressof(m_error) ) error_type( e );
     }
 
     void construct_error( error_type && e )
     {
-        new( &m_error ) error_type( std::move( e ) );
+        new( std11::addressof(m_error) ) error_type( std::move( e ) );
     }
 
     template< class... Args >
     void emplace_error( Args&&... args )
     {
-        new( &m_error ) error_type( std::forward<Args>(args)...);
+        new( std11::addressof(m_error) ) error_type( std::forward<Args>(args)...);
     }
 
     template< class U, class... Args >
     void emplace_error( std::initializer_list<U> il, Args&&... args )
     {
-        new( &m_error ) error_type( il, std::forward<Args>(args)... );
+        new( std11::addressof(m_error) ) error_type( il, std::forward<Args>(args)... );
     }
 
     void destruct_error()

Original file line number	Diff line number	Diff line change
`@@ -614,24 +614,24 @@ class storage_t_noncopy_nonmove_impl`
`614`	`614`
`615`	`615`	`// void construct_error( error_type const & e )`
`616`	`616`	`// {`
`617`		`- // // new( &m_error ) error_type( e );`
	`617`	`+ // // new( std11::addressof(m_error) ) error_type( e );`
`618`	`618`	`// }`
`619`	`619`
`620`	`620`	`// void construct_error( error_type && e )`
`621`	`621`	`// {`
`622`		`- // // new( &m_error ) error_type( std::move( e ) );`
	`622`	`+ // // new( std11::addressof(m_error) ) error_type( std::move( e ) );`
`623`	`623`	`// }`
`624`	`624`
`625`	`625`	`template< class... Args >`
`626`	`626`	`void emplace_error( Args&&... args )`
`627`	`627`	`{`
`628`		`- new( &m_error ) error_type( std::forward<Args>(args)...);`
	`628`	`+ new( std11::addressof(m_error) ) error_type( std::forward<Args>(args)...);`
`629`	`629`	`}`
`630`	`630`
`631`	`631`	`template< class U, class... Args >`
`632`	`632`	`void emplace_error( std::initializer_list<U> il, Args&&... args )`
`633`	`633`	`{`
`634`		`- new( &m_error ) error_type( il, std::forward<Args>(args)... );`
	`634`	`+ new( std11::addressof(m_error) ) error_type( il, std::forward<Args>(args)... );`
`635`	`635`	`}`
`636`	`636`
`637`	`637`	`void destruct_error()`
`@@ -760,24 +760,24 @@ class storage_t_impl`
`760`	`760`
`761`	`761`	`void construct_error( error_type const & e )`
`762`	`762`	`{`
`763`		`- new( &m_error ) error_type( e );`
	`763`	`+ new( std11::addressof(m_error) ) error_type( e );`
`764`	`764`	`}`
`765`	`765`
`766`	`766`	`void construct_error( error_type && e )`
`767`	`767`	`{`
`768`		`- new( &m_error ) error_type( std::move( e ) );`
	`768`	`+ new( std11::addressof(m_error) ) error_type( std::move( e ) );`
`769`	`769`	`}`
`770`	`770`
`771`	`771`	`template< class... Args >`
`772`	`772`	`void emplace_error( Args&&... args )`
`773`	`773`	`{`
`774`		`- new( &m_error ) error_type( std::forward<Args>(args)...);`
	`774`	`+ new( std11::addressof(m_error) ) error_type( std::forward<Args>(args)...);`
`775`	`775`	`}`
`776`	`776`
`777`	`777`	`template< class U, class... Args >`
`778`	`778`	`void emplace_error( std::initializer_list<U> il, Args&&... args )`
`779`	`779`	`{`
`780`		`- new( &m_error ) error_type( il, std::forward<Args>(args)... );`
	`780`	`+ new( std11::addressof(m_error) ) error_type( il, std::forward<Args>(args)... );`
`781`	`781`	`}`
`782`	`782`
`783`	`783`	`void destruct_error()`
`@@ -876,24 +876,24 @@ struct storage_t_impl< void, E >`
`876`	`876`
`877`	`877`	`void construct_error( error_type const & e )`
`878`	`878`	`{`
`879`		`- new( &m_error ) error_type( e );`
	`879`	`+ new( std11::addressof(m_error) ) error_type( e );`
`880`	`880`	`}`
`881`	`881`
`882`	`882`	`void construct_error( error_type && e )`
`883`	`883`	`{`
`884`		`- new( &m_error ) error_type( std::move( e ) );`
	`884`	`+ new( std11::addressof(m_error) ) error_type( std::move( e ) );`
`885`	`885`	`}`
`886`	`886`
`887`	`887`	`template< class... Args >`
`888`	`888`	`void emplace_error( Args&&... args )`
`889`	`889`	`{`
`890`		`- new( &m_error ) error_type( std::forward<Args>(args)...);`
	`890`	`+ new( std11::addressof(m_error) ) error_type( std::forward<Args>(args)...);`
`891`	`891`	`}`
`892`	`892`
`893`	`893`	`template< class U, class... Args >`
`894`	`894`	`void emplace_error( std::initializer_list<U> il, Args&&... args )`
`895`	`895`	`{`
`896`		`- new( &m_error ) error_type( il, std::forward<Args>(args)... );`
	`896`	`+ new( std11::addressof(m_error) ) error_type( il, std::forward<Args>(args)... );`
`897`	`897`	`}`
`898`	`898`
`899`	`899`	`void destruct_error()`