From e75f00b4fca470f6b2efc7f99a54264e484faf14 Mon Sep 17 00:00:00 2001 From: BenPinet Date: Thu, 4 Jul 2024 15:02:40 +0200 Subject: [PATCH 1/3] fix(Optional): use std::optional BREAKING CHANGE: absl::optional has been replaced by std::optional --- .../inspector/topology/brep_blocks_topology.h | 7 ++--- .../topology/brep_corners_topology.h | 11 ++++---- .../inspector/topology/brep_lines_topology.h | 11 ++++---- .../topology/brep_surfaces_topology.h | 19 ++++++------- .../topology/section_corners_topology.h | 15 +++++----- .../topology/section_lines_topology.h | 14 +++++----- .../topology/section_surfaces_topology.h | 13 ++++----- .../topology/brep_blocks_topology.cpp | 14 ++++++---- .../topology/brep_corners_topology.cpp | 18 ++++++------ .../topology/brep_lines_topology.cpp | 22 ++++++++------- .../topology/brep_surfaces_topology.cpp | 28 ++++++++++--------- .../topology/section_corners_topology.cpp | 18 ++++++------ .../topology/section_lines_topology.cpp | 22 ++++++++------- .../topology/section_surfaces_topology.cpp | 14 ++++++---- 14 files changed, 117 insertions(+), 109 deletions(-) diff --git a/include/geode/inspector/topology/brep_blocks_topology.h b/include/geode/inspector/topology/brep_blocks_topology.h index 8494023d..cd85218b 100644 --- a/include/geode/inspector/topology/brep_blocks_topology.h +++ b/include/geode/inspector/topology/brep_blocks_topology.h @@ -23,12 +23,11 @@ #pragma once +#include #include #include #include -#include - #include #include @@ -77,11 +76,11 @@ namespace geode bool brep_blocks_topology_is_valid( index_t unique_vertex_index ) const; - absl::optional< std::string > + std::optional< std::string > unique_vertex_is_part_of_two_blocks_and_no_boundary_surface( index_t unique_vertex_index ) const; - absl::optional< std::string > + std::optional< std::string > unique_vertex_block_cmvs_count_is_incorrect( index_t unique_vertex_index ) const; diff --git a/include/geode/inspector/topology/brep_corners_topology.h b/include/geode/inspector/topology/brep_corners_topology.h index c5549657..a27c75a4 100644 --- a/include/geode/inspector/topology/brep_corners_topology.h +++ b/include/geode/inspector/topology/brep_corners_topology.h @@ -23,10 +23,9 @@ #pragma once +#include #include -#include - #include #include @@ -86,16 +85,16 @@ namespace geode */ bool brep_corner_topology_is_valid( index_t unique_vertex_index ) const; - absl::optional< std::string > unique_vertex_has_multiple_corners( + std::optional< std::string > unique_vertex_has_multiple_corners( index_t unique_vertex_index ) const; - absl::optional< std::string > corner_has_multiple_embeddings( + std::optional< std::string > corner_has_multiple_embeddings( index_t unique_vertex_index ) const; - absl::optional< std::string > corner_is_not_internal_nor_boundary( + std::optional< std::string > corner_is_not_internal_nor_boundary( index_t unique_vertex_index ) const; - absl::optional< std::string > corner_is_part_of_line_but_not_boundary( + std::optional< std::string > corner_is_part_of_line_but_not_boundary( index_t unique_vertex_index ) const; BRepCornersTopologyInspectionResult inspect_corners_topology() const; diff --git a/include/geode/inspector/topology/brep_lines_topology.h b/include/geode/inspector/topology/brep_lines_topology.h index 15c84bf6..cce93b5f 100644 --- a/include/geode/inspector/topology/brep_lines_topology.h +++ b/include/geode/inspector/topology/brep_lines_topology.h @@ -22,10 +22,9 @@ */ #pragma once +#include #include -#include - #include #include @@ -93,17 +92,17 @@ namespace geode */ bool brep_lines_topology_is_valid( index_t unique_vertex_index ) const; - absl::optional< std::string > + std::optional< std::string > vertex_is_part_of_not_internal_nor_boundary_line( index_t unique_vertex_index ) const; - absl::optional< std::string > vertex_is_part_of_invalid_embedded_line( + std::optional< std::string > vertex_is_part_of_invalid_embedded_line( index_t unique_vertex_index ) const; - absl::optional< std::string > vertex_is_part_of_invalid_single_line( + std::optional< std::string > vertex_is_part_of_invalid_single_line( index_t unique_vertex_index ) const; - absl::optional< std::string > vertex_has_lines_but_is_not_a_corner( + std::optional< std::string > vertex_has_lines_but_is_not_a_corner( index_t unique_vertex_index ) const; BRepLinesTopologyInspectionResult inspect_lines_topology() const; diff --git a/include/geode/inspector/topology/brep_surfaces_topology.h b/include/geode/inspector/topology/brep_surfaces_topology.h index abbde1cf..df5e0b88 100644 --- a/include/geode/inspector/topology/brep_surfaces_topology.h +++ b/include/geode/inspector/topology/brep_surfaces_topology.h @@ -22,7 +22,7 @@ */ #pragma once -#include +#include #include #include @@ -36,8 +36,8 @@ namespace geode namespace geode { - struct opengeode_inspector_inspector_api - BRepSurfacesTopologyInspectionResult + struct + opengeode_inspector_inspector_api BRepSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ "uuids of surface without mesh." @@ -103,22 +103,21 @@ namespace geode bool brep_surfaces_topology_is_valid( index_t unique_vertex_index ) const; - absl::optional< std::string > + std::optional< std::string > vertex_is_part_of_not_internal_nor_boundary_surface( index_t unique_vertex_index ) const; - absl::optional< std::string > - vertex_is_part_of_invalid_embedded_surface( - index_t unique_vertex_index ) const; + std::optional< std::string > vertex_is_part_of_invalid_embedded_surface( + index_t unique_vertex_index ) const; - absl::optional< std::string > vertex_is_part_of_invalid_single_surface( + std::optional< std::string > vertex_is_part_of_invalid_single_surface( index_t unique_vertex_index ) const; - absl::optional< std::string > + std::optional< std::string > vertex_is_part_of_invalid_multiple_surfaces( index_t unique_vertex_index ) const; - absl::optional< std::string > + std::optional< std::string > vertex_is_part_of_line_and_not_on_surface_border( index_t unique_vertex_index ) const; diff --git a/include/geode/inspector/topology/section_corners_topology.h b/include/geode/inspector/topology/section_corners_topology.h index f53a5cb9..313e6888 100644 --- a/include/geode/inspector/topology/section_corners_topology.h +++ b/include/geode/inspector/topology/section_corners_topology.h @@ -22,10 +22,9 @@ */ #pragma once +#include #include -#include - #include #include @@ -38,8 +37,8 @@ namespace geode namespace geode { - struct opengeode_inspector_inspector_api - SectionCornersTopologyInspectionResult + struct + opengeode_inspector_inspector_api SectionCornersTopologyInspectionResult { InspectionIssues< uuid > corners_not_meshed{ "uuids of Corners without mesh." @@ -87,16 +86,16 @@ namespace geode bool section_corner_topology_is_valid( index_t unique_vertex_index ) const; - absl::optional< std::string > unique_vertex_has_multiple_corners( + std::optional< std::string > unique_vertex_has_multiple_corners( index_t unique_vertex_index ) const; - absl::optional< std::string > corner_has_multiple_embeddings( + std::optional< std::string > corner_has_multiple_embeddings( index_t unique_vertex_index ) const; - absl::optional< std::string > corner_is_not_internal_nor_boundary( + std::optional< std::string > corner_is_not_internal_nor_boundary( index_t unique_vertex_index ) const; - absl::optional< std::string > corner_is_part_of_line_but_not_boundary( + std::optional< std::string > corner_is_part_of_line_but_not_boundary( index_t unique_vertex_index ) const; SectionCornersTopologyInspectionResult inspect_corners_topology() const; diff --git a/include/geode/inspector/topology/section_lines_topology.h b/include/geode/inspector/topology/section_lines_topology.h index 0dbfc47b..86ee182a 100644 --- a/include/geode/inspector/topology/section_lines_topology.h +++ b/include/geode/inspector/topology/section_lines_topology.h @@ -21,7 +21,7 @@ * */ #pragma once -#include +#include #include @@ -35,8 +35,8 @@ namespace geode namespace geode { - struct opengeode_inspector_inspector_api - SectionLinesTopologyInspectionResult + struct + opengeode_inspector_inspector_api SectionLinesTopologyInspectionResult { InspectionIssues< uuid > lines_not_meshed{ "uuids of Lines without mesh." @@ -93,17 +93,17 @@ namespace geode bool section_lines_topology_is_valid( index_t unique_vertex_index ) const; - absl::optional< std::string > + std::optional< std::string > vertex_is_part_of_not_internal_nor_boundary_line( const index_t unique_vertex_index ) const; - absl::optional< std::string > vertex_is_part_of_invalid_embedded_line( + std::optional< std::string > vertex_is_part_of_invalid_embedded_line( const index_t unique_vertex_index ) const; - absl::optional< std::string > vertex_is_part_of_invalid_single_line( + std::optional< std::string > vertex_is_part_of_invalid_single_line( index_t unique_vertex_index ) const; - absl::optional< std::string > vertex_has_lines_but_is_not_a_corner( + std::optional< std::string > vertex_has_lines_but_is_not_a_corner( index_t unique_vertex_index ) const; SectionLinesTopologyInspectionResult inspect_lines_topology() const; diff --git a/include/geode/inspector/topology/section_surfaces_topology.h b/include/geode/inspector/topology/section_surfaces_topology.h index 0d1b76c9..756c1a35 100644 --- a/include/geode/inspector/topology/section_surfaces_topology.h +++ b/include/geode/inspector/topology/section_surfaces_topology.h @@ -22,7 +22,7 @@ */ #pragma once -#include +#include #include @@ -36,8 +36,8 @@ namespace geode namespace geode { - struct opengeode_inspector_inspector_api - SectionSurfacesTopologyInspectionResult + struct + opengeode_inspector_inspector_api SectionSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ "uuids of Surfaces without mesh." @@ -78,11 +78,10 @@ namespace geode bool section_vertex_surfaces_topology_is_valid( index_t unique_vertex_index ) const; - absl::optional< std::string > - vertex_is_part_of_invalid_embedded_surface( - index_t unique_vertex_index ) const; + std::optional< std::string > vertex_is_part_of_invalid_embedded_surface( + index_t unique_vertex_index ) const; - absl::optional< std::string > + std::optional< std::string > vertex_is_part_of_line_and_not_on_surface_border( index_t unique_vertex_index ) const; diff --git a/src/geode/inspector/topology/brep_blocks_topology.cpp b/src/geode/inspector/topology/brep_blocks_topology.cpp index 114585b8..df30fa8b 100644 --- a/src/geode/inspector/topology/brep_blocks_topology.cpp +++ b/src/geode/inspector/topology/brep_blocks_topology.cpp @@ -23,6 +23,8 @@ #include +#include + #include #include @@ -113,7 +115,7 @@ namespace geode unique_vertex_index ) ); } - absl::optional< std::string > BRepBlocksTopology:: + std::optional< std::string > BRepBlocksTopology:: unique_vertex_is_part_of_two_blocks_and_no_boundary_surface( index_t unique_vertex_index ) const { @@ -121,7 +123,7 @@ namespace geode brep_, unique_vertex_index, Block3D::component_type_static() ); if( block_uuids.size() != 2 ) { - return absl::nullopt; + return std::nullopt; } for( const auto& surface_cmv : brep_.component_mesh_vertices( unique_vertex_index ) ) @@ -136,7 +138,7 @@ namespace geode && brep_.Relationships::is_boundary( surface_cmv.component_id.id(), block_uuids[1] ) ) { - return absl::nullopt; + return std::nullopt; } for( const auto& line_cmv : brep_.component_mesh_vertices( unique_vertex_index ) ) @@ -154,7 +156,7 @@ namespace geode || brep_.Relationships::is_boundary( surface_cmv.component_id.id(), block_uuids[1] ) ) ) { - return absl::nullopt; + return std::nullopt; } } } @@ -164,7 +166,7 @@ namespace geode "surfaces." ); } - absl::optional< std::string > + std::optional< std::string > BRepBlocksTopology::unique_vertex_block_cmvs_count_is_incorrect( index_t unique_vertex_index ) const { @@ -324,7 +326,7 @@ namespace geode " block CMVs (should be ", predicted_nb_block_cmvs, ")." ); } } - return absl::nullopt; + return std::nullopt; } BRepBlocksTopologyInspectionResult diff --git a/src/geode/inspector/topology/brep_corners_topology.cpp b/src/geode/inspector/topology/brep_corners_topology.cpp index 816c79fe..1e2b27a4 100644 --- a/src/geode/inspector/topology/brep_corners_topology.cpp +++ b/src/geode/inspector/topology/brep_corners_topology.cpp @@ -24,6 +24,8 @@ #include #include +#include + #include #include @@ -127,7 +129,7 @@ namespace geode return true; } - absl::optional< std::string > + std::optional< std::string > BRepCornersTopology::unique_vertex_has_multiple_corners( index_t unique_vertex_index ) const { @@ -145,10 +147,10 @@ namespace geode corner_found = true; } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > BRepCornersTopology::corner_has_multiple_embeddings( index_t unique_vertex_index ) const { @@ -164,10 +166,10 @@ namespace geode "', which has several embeddings." ); } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > BRepCornersTopology::corner_is_not_internal_nor_boundary( index_t unique_vertex_index ) const { @@ -184,10 +186,10 @@ namespace geode "', which is neither internal nor boundary." ); } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > BRepCornersTopology::corner_is_part_of_line_but_not_boundary( index_t unique_vertex_index ) const { @@ -246,7 +248,7 @@ namespace geode "', but is neither boundary nor internal of it." ); } } - return absl::nullopt; + return std::nullopt; } BRepCornersTopologyInspectionResult diff --git a/src/geode/inspector/topology/brep_lines_topology.cpp b/src/geode/inspector/topology/brep_lines_topology.cpp index 1a4131b8..bf1e1a69 100644 --- a/src/geode/inspector/topology/brep_lines_topology.cpp +++ b/src/geode/inspector/topology/brep_lines_topology.cpp @@ -23,6 +23,8 @@ #include +#include + #include #include @@ -124,7 +126,7 @@ namespace geode return true; } - absl::optional< std::string > + std::optional< std::string > BRepLinesTopology::vertex_is_part_of_not_internal_nor_boundary_line( index_t unique_vertex_index ) const { @@ -141,10 +143,10 @@ namespace geode "', which is neither embedded nor incident." ); } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > BRepLinesTopology::vertex_is_part_of_invalid_embedded_line( index_t unique_vertex_index ) const { @@ -190,10 +192,10 @@ namespace geode } } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > BRepLinesTopology::vertex_is_part_of_invalid_single_line( index_t unique_vertex_index ) const { @@ -201,7 +203,7 @@ namespace geode brep_, unique_vertex_index, Line3D::component_type_static() ); if( line_uuids.size() != 1 ) { - return absl::nullopt; + return std::nullopt; } const auto& line_id = line_uuids[0]; const auto surface_uuids = detail::components_uuids( @@ -229,7 +231,7 @@ namespace geode { if( !detail::brep_blocks_are_meshed( brep_ ) ) { - return absl::nullopt; + return std::nullopt; } if( block_uuids.size() != 1 ) { @@ -267,10 +269,10 @@ namespace geode } } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > BRepLinesTopology::vertex_has_lines_but_is_not_a_corner( index_t unique_vertex_index ) const { @@ -295,7 +297,7 @@ namespace geode unique_vertex_index, " is part of multiple lines but is not a corner." ); } - return absl::nullopt; + return std::nullopt; } BRepLinesTopologyInspectionResult diff --git a/src/geode/inspector/topology/brep_surfaces_topology.cpp b/src/geode/inspector/topology/brep_surfaces_topology.cpp index 32054937..303fb304 100644 --- a/src/geode/inspector/topology/brep_surfaces_topology.cpp +++ b/src/geode/inspector/topology/brep_surfaces_topology.cpp @@ -23,6 +23,8 @@ #include +#include + #include #include @@ -168,7 +170,7 @@ namespace geode return true; } - absl::optional< std::string > BRepSurfacesTopology:: + std::optional< std::string > BRepSurfacesTopology:: vertex_is_part_of_not_internal_nor_boundary_surface( index_t unique_vertex_index ) const { @@ -186,10 +188,10 @@ namespace geode "a block." ); } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > BRepSurfacesTopology::vertex_is_part_of_invalid_embedded_surface( const index_t unique_vertex_index ) const { @@ -224,10 +226,10 @@ namespace geode } } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > BRepSurfacesTopology::vertex_is_part_of_invalid_single_surface( index_t unique_vertex_index ) const { @@ -235,7 +237,7 @@ namespace geode brep_, unique_vertex_index, Surface3D::component_type_static() ); if( surface_uuids.size() != 1 ) { - return absl::nullopt; + return std::nullopt; } const auto& surface_id = surface_uuids[0]; const auto block_uuids = detail::components_uuids( @@ -285,10 +287,10 @@ namespace geode } } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > BRepSurfacesTopology::vertex_is_part_of_invalid_multiple_surfaces( index_t unique_vertex_index ) const { @@ -296,7 +298,7 @@ namespace geode brep_, unique_vertex_index, Surface3D::component_type_static() ); if( surface_uuids.size() < 2 ) { - return absl::nullopt; + return std::nullopt; } const auto line_uuids = detail::components_uuids( brep_, unique_vertex_index, Line3D::component_type_static() ); @@ -368,10 +370,10 @@ namespace geode } } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > BRepSurfacesTopology::vertex_is_part_of_line_and_not_on_surface_border( index_t unique_vertex_index ) const { @@ -379,7 +381,7 @@ namespace geode brep_, unique_vertex_index, Line3D::component_type_static() ); if( line_uuids.empty() ) { - return absl::nullopt; + return std::nullopt; } for( const auto& cmv : brep_.component_mesh_vertices( unique_vertex_index ) ) @@ -408,7 +410,7 @@ namespace geode } } } - return absl::nullopt; + return std::nullopt; } BRepSurfacesTopologyInspectionResult BRepSurfacesTopology::inspect_surfaces_topology() const diff --git a/src/geode/inspector/topology/section_corners_topology.cpp b/src/geode/inspector/topology/section_corners_topology.cpp index fcd2e5cb..2a146801 100644 --- a/src/geode/inspector/topology/section_corners_topology.cpp +++ b/src/geode/inspector/topology/section_corners_topology.cpp @@ -21,6 +21,8 @@ * */ +#include + #include #include @@ -139,7 +141,7 @@ namespace geode return true; } - absl::optional< std::string > + std::optional< std::string > SectionCornersTopology::unique_vertex_has_multiple_corners( index_t unique_vertex_index ) const { @@ -157,10 +159,10 @@ namespace geode corner_found = true; } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > SectionCornersTopology::corner_has_multiple_embeddings( index_t unique_vertex_index ) const { @@ -176,10 +178,10 @@ namespace geode "', which has several embeddings." ); } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > SectionCornersTopology::corner_is_not_internal_nor_boundary( index_t unique_vertex_index ) const { @@ -196,10 +198,10 @@ namespace geode "', which is neither internal nor boundary." ); } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > SectionCornersTopology::corner_is_part_of_line_but_not_boundary( index_t unique_vertex_index ) const { @@ -231,7 +233,7 @@ namespace geode } } } - return absl::nullopt; + return std::nullopt; } SectionCornersTopologyInspectionResult diff --git a/src/geode/inspector/topology/section_lines_topology.cpp b/src/geode/inspector/topology/section_lines_topology.cpp index 64c9c843..69a4da8e 100644 --- a/src/geode/inspector/topology/section_lines_topology.cpp +++ b/src/geode/inspector/topology/section_lines_topology.cpp @@ -23,6 +23,8 @@ #include +#include + #include #include @@ -126,7 +128,7 @@ namespace geode return true; } - absl::optional< std::string > + std::optional< std::string > SectionLinesTopology::vertex_is_part_of_not_internal_nor_boundary_line( const index_t unique_vertex_index ) const { @@ -146,10 +148,10 @@ namespace geode "', which is neither embedded nor incident." ); } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > SectionLinesTopology::vertex_is_part_of_invalid_embedded_line( const index_t unique_vertex_index ) const { @@ -163,7 +165,7 @@ namespace geode } if( section_.nb_embeddings( line_cmv.component_id.id() ) < 1 ) { - return absl::nullopt; + return std::nullopt; } if( section_.nb_embeddings( line_cmv.component_id.id() ) > 1 ) { @@ -200,10 +202,10 @@ namespace geode } } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > SectionLinesTopology::vertex_is_part_of_invalid_single_line( index_t unique_vertex_index ) const { @@ -211,7 +213,7 @@ namespace geode section_, unique_vertex_index, Line2D::component_type_static() ); if( line_uuids.size() != 1 ) { - return absl::nullopt; + return std::nullopt; } const auto& line_id = line_uuids[0]; const auto surface_uuids = detail::components_uuids( @@ -255,10 +257,10 @@ namespace geode } } } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > + std::optional< std::string > SectionLinesTopology::vertex_has_lines_but_is_not_a_corner( index_t unique_vertex_index ) const { @@ -283,7 +285,7 @@ namespace geode unique_vertex_index, " is part of multiple lines but is not a corner." ); } - return absl::nullopt; + return std::nullopt; } SectionLinesTopologyInspectionResult diff --git a/src/geode/inspector/topology/section_surfaces_topology.cpp b/src/geode/inspector/topology/section_surfaces_topology.cpp index 3f0b2092..d8970c61 100644 --- a/src/geode/inspector/topology/section_surfaces_topology.cpp +++ b/src/geode/inspector/topology/section_surfaces_topology.cpp @@ -23,6 +23,8 @@ #include +#include + #include #include @@ -106,7 +108,7 @@ namespace geode return true; } - absl::optional< std::string > + std::optional< std::string > SectionSurfacesTopology::vertex_is_part_of_invalid_embedded_surface( index_t unique_vertex_index ) const { @@ -127,7 +129,7 @@ namespace geode && section_.Relationships::is_boundary( line_cmv.component_id.id(), surface_uuids[1] ) ) { - return absl::nullopt; + return std::nullopt; } } return absl::StrCat( "Unique vertex with index ", @@ -135,16 +137,16 @@ namespace geode " is part of two surfaces, but is associated to no " "line boundary of the two surfaces." ); } - return absl::nullopt; + return std::nullopt; } - absl::optional< std::string > SectionSurfacesTopology:: + std::optional< std::string > SectionSurfacesTopology:: vertex_is_part_of_line_and_not_on_surface_border( index_t unique_vertex_index ) const { if( !detail::section_surfaces_are_meshed( section_ ) ) { - return absl::nullopt; + return std::nullopt; } for( const auto& line_cmv : section_.component_mesh_vertices( unique_vertex_index ) ) @@ -175,7 +177,7 @@ namespace geode } } } - return absl::nullopt; + return std::nullopt; } SectionSurfacesTopologyInspectionResult From 753b7708078f5db3467b6d9689d0ddd7951d435e Mon Sep 17 00:00:00 2001 From: BenPinet Date: Thu, 4 Jul 2024 13:04:18 +0000 Subject: [PATCH 2/3] Apply prepare changes --- bindings/python/requirements.txt | 4 ++-- include/geode/inspector/topology/brep_surfaces_topology.h | 4 ++-- include/geode/inspector/topology/section_corners_topology.h | 4 ++-- include/geode/inspector/topology/section_lines_topology.h | 4 ++-- include/geode/inspector/topology/section_surfaces_topology.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bindings/python/requirements.txt b/bindings/python/requirements.txt index 11dd5781..186c1726 100644 --- a/bindings/python/requirements.txt +++ b/bindings/python/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile bindings/python/requirements.in +# pip-compile --pre bindings/python/requirements.in # -opengeode-core==14.*,>=14.24.3 +opengeode-core==14.*,>=14.25.2rc2 # via -r bindings/python/requirements.in diff --git a/include/geode/inspector/topology/brep_surfaces_topology.h b/include/geode/inspector/topology/brep_surfaces_topology.h index df5e0b88..78aaeda3 100644 --- a/include/geode/inspector/topology/brep_surfaces_topology.h +++ b/include/geode/inspector/topology/brep_surfaces_topology.h @@ -36,8 +36,8 @@ namespace geode namespace geode { - struct - opengeode_inspector_inspector_api BRepSurfacesTopologyInspectionResult + struct opengeode_inspector_inspector_api + BRepSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ "uuids of surface without mesh." diff --git a/include/geode/inspector/topology/section_corners_topology.h b/include/geode/inspector/topology/section_corners_topology.h index 313e6888..68fa2e9d 100644 --- a/include/geode/inspector/topology/section_corners_topology.h +++ b/include/geode/inspector/topology/section_corners_topology.h @@ -37,8 +37,8 @@ namespace geode namespace geode { - struct - opengeode_inspector_inspector_api SectionCornersTopologyInspectionResult + struct opengeode_inspector_inspector_api + SectionCornersTopologyInspectionResult { InspectionIssues< uuid > corners_not_meshed{ "uuids of Corners without mesh." diff --git a/include/geode/inspector/topology/section_lines_topology.h b/include/geode/inspector/topology/section_lines_topology.h index 86ee182a..47534215 100644 --- a/include/geode/inspector/topology/section_lines_topology.h +++ b/include/geode/inspector/topology/section_lines_topology.h @@ -35,8 +35,8 @@ namespace geode namespace geode { - struct - opengeode_inspector_inspector_api SectionLinesTopologyInspectionResult + struct opengeode_inspector_inspector_api + SectionLinesTopologyInspectionResult { InspectionIssues< uuid > lines_not_meshed{ "uuids of Lines without mesh." diff --git a/include/geode/inspector/topology/section_surfaces_topology.h b/include/geode/inspector/topology/section_surfaces_topology.h index 756c1a35..4df7a81f 100644 --- a/include/geode/inspector/topology/section_surfaces_topology.h +++ b/include/geode/inspector/topology/section_surfaces_topology.h @@ -36,8 +36,8 @@ namespace geode namespace geode { - struct - opengeode_inspector_inspector_api SectionSurfacesTopologyInspectionResult + struct opengeode_inspector_inspector_api + SectionSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ "uuids of Surfaces without mesh." From 0598a06d980b9180ffb4cde49fce365e5f3acb47 Mon Sep 17 00:00:00 2001 From: BenPinet Date: Fri, 5 Jul 2024 13:46:26 +0200 Subject: [PATCH 3/3] change vscode settings to c++17 --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ddbebc68..d0705750 100644 --- a/.vscode/settings.json +++ b/.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",