Merge pull request #955 from Geode-solutions/fix-replace-absl-optional-with-std-optional

fix(Optional): use std::optional

Author: panquez

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-    "C_Cpp.default.cppStandard": "c++11",
+    "C_Cpp.default.cppStandard": "c++17",
     "C_Cpp.default.includePath": [
         "${workspaceFolder}/include",
         "${workspaceFolder}/build/opengeode",

bindings/python/src/common.h

@@ -28,7 +28,6 @@
 #include <absl/container/fixed_array.h>
 #include <absl/container/inlined_vector.h>
 #include <absl/strings/string_view.h>
-#include <absl/types/optional.h>
 #include <absl/types/span.h>
 
 namespace pybind11
@@ -78,10 +77,5 @@ namespace pybind11
         {
         };
 
-        template < typename T >
-        struct type_caster< absl::optional< T > >
-            : public optional_caster< absl::optional< T > >
-        {
-        };
     } // namespace detail
 } // namespace pybind11

bindings/python/src/geometry/basic_objects.cpp

@@ -92,10 +92,10 @@ namespace geode
         PYTHON_TRIANGLE( 2 );
         PYTHON_TRIANGLE( 3 )
             .def( "normal",
-                static_cast< absl::optional< Vector3D > ( Triangle< 3 >::* )()
+                static_cast< std::optional< Vector3D > ( Triangle< 3 >::* )()
                         const >( &Triangle3D::normal ) )
             .def( "plane",
-                static_cast< absl::optional< Plane > ( Triangle< 3 >::* )()
+                static_cast< std::optional< Plane > ( Triangle< 3 >::* )()
                         const >( &Triangle3D::plane ) );
 
         pybind11::class_< Plane >( module, "Plane" )

include/geode/basic/cell_array.h

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <absl/types/optional.h>
+#include <optional>
 
 #include <geode/basic/common.h>
 #include <geode/basic/pimpl.h>
@@ -60,10 +60,10 @@ namespace geode
 
         virtual CellIndices cell_indices( index_t index ) const = 0;
 
-        absl::optional< CellIndices > next_cell(
+        std::optional< CellIndices > next_cell(
             const CellIndices& index, index_t direction ) const;
 
-        absl::optional< CellIndices > previous_cell(
+        std::optional< CellIndices > previous_cell(
             const CellIndices& index, index_t direction ) const;
 
         bool is_cell_on_border( const CellIndices& cell_indices ) const;

include/geode/basic/file.h

@@ -23,7 +23,8 @@
 
 #pragma once
 
-#include <absl/types/optional.h>
+#include <optional>
+
 #include <absl/types/span.h>
 
 #include <geode/basic/common.h>
@@ -44,9 +45,9 @@ namespace geode
     std::string opengeode_basic_api goto_keywords(
         std::ifstream& file, absl::Span< const absl::string_view > words );
 
-    absl::optional< std::string > opengeode_basic_api goto_keyword_if_it_exists(
+    std::optional< std::string > opengeode_basic_api goto_keyword_if_it_exists(
         std::ifstream& file, absl::string_view word );
 
-    absl::optional< std::string > opengeode_basic_api next_keyword_if_it_exists(
+    std::optional< std::string > opengeode_basic_api next_keyword_if_it_exists(
         std::ifstream& file, absl::string_view word );
 } // namespace geode

include/geode/geometry/basic_objects/triangle.h

@@ -23,6 +23,8 @@
 
 #pragma once
 
+#include <optional>
+
 #include <geode/geometry/common.h>
 #include <geode/geometry/vector.h>
 
@@ -59,20 +61,20 @@ namespace geode
 
         Point< dimension > barycenter() const;
         template < index_t T = dimension >
-        typename std::enable_if< T == 3, absl::optional< Vector3D > >::type
+        typename std::enable_if< T == 3, std::optional< Vector3D > >::type
             normal() const;
         template < index_t T = dimension >
-        typename std::enable_if< T == 3, absl::optional< Plane > >::type
+        typename std::enable_if< T == 3, std::optional< Plane > >::type
             plane() const;
         template < index_t T = dimension >
-        typename std::enable_if< T == 3, absl::optional< OwnerPlane > >::type
+        typename std::enable_if< T == 3, std::optional< OwnerPlane > >::type
             owner_plane() const;
         template < index_t T = dimension >
-        typename std::enable_if< T == 3, absl::optional< local_index_t > >::type
+        typename std::enable_if< T == 3, std::optional< local_index_t > >::type
             pivot() const;
         template < index_t T = dimension >
         typename std::enable_if< T == 3,
-            absl::optional< std::pair< local_index_t, Vector3D > > >::type
+            std::optional< std::pair< local_index_t, Vector3D > > >::type
             pivot_and_normal() const;
         void set_point( index_t vertex, PointType point );
         const std::array< PointType, 3 >& vertices() const;

include/geode/geometry/intersection.h

@@ -23,8 +23,9 @@
 
 #pragma once
 
+#include <optional>
+
 #include <absl/container/inlined_vector.h>
-#include <absl/types/optional.h>
 
 #include <geode/geometry/common.h>
 
@@ -98,9 +99,9 @@ namespace geode
             return has_intersection();
         }
 
-        absl::optional< Intersection > result;
+        std::optional< Intersection > result;
         IntersectionType type;
-        absl::optional< CorrectnessInfo< Intersection > > correctness;
+        std::optional< CorrectnessInfo< Intersection > > correctness;
     };
 
     /*!

include/geode/mesh/core/detail/facet_storage.h

@@ -63,15 +63,15 @@ namespace geode
                 return facet_attribute_manager_;
             }
 
-            absl::optional< index_t > find_facet(
+            std::optional< index_t > find_facet(
                 TypedVertexCycle vertices ) const
             {
                 const auto itr = facet_indices_.find( vertices );
                 if( itr != facet_indices_.end() )
                 {
                     return itr->second;
                 }
-                return absl::nullopt;
+                return std::nullopt;
             }
 
             index_t add_facet( TypedVertexCycle vertices )

include/geode/mesh/core/geode/geode_hybrid_solid.h

@@ -138,7 +138,7 @@ namespace geode
             const PolyhedronFacetVertex& polyhedron_facet_vertex )
             const override;
 
-        absl::optional< index_t > get_polyhedron_adjacent(
+        std::optional< index_t > get_polyhedron_adjacent(
             const PolyhedronFacet& polyhedron_facet ) const override;
 
         PolyhedronEdgesVertices polyhedron_edges_vertices(

include/geode/mesh/core/geode/geode_polygonal_surface.h

@@ -119,7 +119,7 @@ namespace geode
         local_index_t get_nb_polygon_vertices(
             index_t polygon_id ) const override;
 
-        absl::optional< index_t > get_polygon_adjacent(
+        std::optional< index_t > get_polygon_adjacent(
             const PolygonEdge& polygon_edge ) const override;
 
     private: