Potentially remove temporaries with std::optional

taocpp · May 21, 2024 · fd790c9 · fd790c9
1 parent 65ad951
commit fd790c9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/include/tao/pq/connection.hpp b/include/tao/pq/connection.hpp
@@ -9,6 +9,7 @@
 #include <functional>
 #include <map>
 #include <memory>
+#include <optional>
 #include <set>
 #include <string>
 #include <string_view>

diff --git a/include/tao/pq/result.hpp b/include/tao/pq/result.hpp
@@ -249,7 +249,7 @@ namespace tao::pq
          if( empty() ) {
             return std::nullopt;
          }
-         return as< T >();
+         return std::optional< T >( as< T >() );
       }
 
       template< typename T, typename U >

diff --git a/include/tao/pq/result_traits_optional.hpp b/include/tao/pq/result_traits_optional.hpp
@@ -22,15 +22,15 @@ struct tao::pq::result_traits< std::optional< T > >
 
    [[nodiscard]] static auto from( const char* value ) -> std::optional< T >
    {
-      return result_traits< T >::from( value );
+      return std::optional< T >( result_traits< T >::from( value ) );
    }
 
    template< typename Row >
    [[nodiscard]] static auto from( const Row& row ) -> std::optional< T >
    {
       for( std::size_t column = 0; column < row.columns(); ++column ) {
          if( !row.is_null( column ) ) {
-            return result_traits< T >::from( row );
+            return std::optional< T >( result_traits< T >::from( row ) );
          }
       }
       return null();