fix

BotellaA · BotellaA · commit d2268a50f813 · 2025-11-14T21:38:52.000+01:00
diff --git a/include/geode/image/io/geode/geode_bitsery_raster_input.hpp b/include/geode/image/io/geode/geode_bitsery_raster_input.hpp
@@ -62,8 +62,7 @@ namespace geode
             return image;
         }
 
-        typename RasterImageInput< dimension >::AdditionalFiles
-            additional_files() const final
+        AdditionalFiles additional_files() const final
         {
             return {};
         }
diff --git a/include/geode/image/io/raster_image_input.hpp b/include/geode/image/io/raster_image_input.hpp
@@ -58,8 +58,8 @@ namespace geode
     };
 
     template < index_t dimension >
-    [[nodiscard]] typename RasterImageInput< dimension >::AdditionalFiles
-        raster_image_additional_files( std::string_view filename );
+    [[nodiscard]] AdditionalFiles raster_image_additional_files(
+        std::string_view filename );
 
     template < index_t dimension >
     [[nodiscard]] Percentage is_raster_image_loadable(
diff --git a/include/geode/mesh/io/edged_curve_input.hpp b/include/geode/mesh/io/edged_curve_input.hpp
@@ -73,8 +73,8 @@ namespace geode
     ALIAS_2D_AND_3D( EdgedCurveInput );
 
     template < index_t dimension >
-    [[nodiscard]] typename EdgedCurveInput< dimension >::AdditionalFiles
-        edged_curve_additional_files( std::string_view filename );
+    [[nodiscard]] AdditionalFiles edged_curve_additional_files(
+        std::string_view filename );
 
     template < index_t dimension >
     [[nodiscard]] Percentage is_edged_curve_loadable(
diff --git a/include/geode/mesh/io/geode/geode_bitsery_mesh_input.hpp b/include/geode/mesh/io/geode/geode_bitsery_mesh_input.hpp
@@ -72,8 +72,7 @@
         {                                                                      \
         }                                                                      \
                                                                                \
-        [[nodiscard]] typename Mesh##Input< dimension >::AdditionalFiles       \
-            additional_files() const final                                     \
+        [[nodiscard]] AdditionalFiles additional_files() const final           \
         {                                                                      \
             return {};                                                         \
         }                                                                      \
@@ -91,8 +90,7 @@
         {                                                                      \
         }                                                                      \
                                                                                \
-        [[nodiscard]] typename Mesh##Input::AdditionalFiles                    \
-            additional_files() const final                                     \
+        [[nodiscard]] AdditionalFiles additional_files() const final           \
         {                                                                      \
             return {};                                                         \
         }                                                                      \
diff --git a/include/geode/mesh/io/geode/geode_light_regular_grid_input.hpp b/include/geode/mesh/io/geode/geode_light_regular_grid_input.hpp
@@ -81,8 +81,7 @@ namespace geode
             return grid;
         }
 
-        typename LightRegularGridInput< dimension >::AdditionalFiles
-            additional_files() const override
+        AdditionalFiles additional_files() const override
         {
             return {};
         }
diff --git a/include/geode/mesh/io/graph_input.hpp b/include/geode/mesh/io/graph_input.hpp
@@ -65,8 +65,8 @@ namespace geode
         }
     };
 
-    [[nodiscard]] typename GraphInput::AdditionalFiles opengeode_mesh_api
-        graph_additional_files( std::string_view filename );
+    [[nodiscard]] AdditionalFiles opengeode_mesh_api graph_additional_files(
+        std::string_view filename );
 
     [[nodiscard]] Percentage opengeode_mesh_api is_graph_loadable(
         std::string_view filename );
diff --git a/include/geode/mesh/io/hybrid_solid_input.hpp b/include/geode/mesh/io/hybrid_solid_input.hpp
@@ -73,8 +73,8 @@ namespace geode
     ALIAS_3D( HybridSolidInput );
 
     template < index_t dimension >
-    [[nodiscard]] typename HybridSolidInput< dimension >::AdditionalFiles
-        hybrid_solid_additional_files( std::string_view filename );
+    [[nodiscard]] AdditionalFiles hybrid_solid_additional_files(
+        std::string_view filename );
 
     template < index_t dimension >
     [[nodiscard]] Percentage is_hybrid_solid_loadable(
diff --git a/include/geode/mesh/io/light_regular_grid_input.hpp b/include/geode/mesh/io/light_regular_grid_input.hpp
@@ -58,8 +58,8 @@ namespace geode
     ALIAS_2D_AND_3D( LightRegularGridInput );
 
     template < index_t dimension >
-    [[nodiscard]] typename LightRegularGridInput< dimension >::AdditionalFiles
-        light_regular_grid_additional_files( std::string_view filename );
+    [[nodiscard]] AdditionalFiles light_regular_grid_additional_files(
+        std::string_view filename );
 
     template < index_t dimension >
     [[nodiscard]] Percentage is_light_regular_grid_loadable(
diff --git a/include/geode/mesh/io/point_set_input.hpp b/include/geode/mesh/io/point_set_input.hpp
@@ -73,8 +73,8 @@ namespace geode
     ALIAS_2D_AND_3D( PointSetInput );
 
     template < index_t dimension >
-    [[nodiscard]] typename PointSetInput< dimension >::AdditionalFiles
-        point_set_additional_files( std::string_view filename );
+    [[nodiscard]] AdditionalFiles point_set_additional_files(
+        std::string_view filename );
 
     template < index_t dimension >
     [[nodiscard]] Percentage is_point_set_loadable( std::string_view filename );
diff --git a/include/geode/mesh/io/polygonal_surface_input.hpp b/include/geode/mesh/io/polygonal_surface_input.hpp
@@ -74,8 +74,8 @@ namespace geode
     ALIAS_2D_AND_3D( PolygonalSurfaceInput );
 
     template < index_t dimension >
-    [[nodiscard]] typename PolygonalSurfaceInput< dimension >::AdditionalFiles
-        polygonal_surface_additional_files( std::string_view filename );
+    [[nodiscard]] AdditionalFiles polygonal_surface_additional_files(
+        std::string_view filename );
 
     template < index_t dimension >
     [[nodiscard]] Percentage is_polygonal_surface_loadable(
diff --git a/include/geode/mesh/io/polyhedral_solid_input.hpp b/include/geode/mesh/io/polyhedral_solid_input.hpp
@@ -74,8 +74,8 @@ namespace geode
     ALIAS_3D( PolyhedralSolidInput );
 
     template < index_t dimension >
-    [[nodiscard]] typename PolyhedralSolidInput< dimension >::AdditionalFiles
-        polyhedral_solid_additional_files( std::string_view filename );
+    [[nodiscard]] AdditionalFiles polyhedral_solid_additional_files(
+        std::string_view filename );
 
     template < index_t dimension >
     [[nodiscard]] Percentage is_polyhedral_solid_loadable(
diff --git a/include/geode/mesh/io/regular_grid_input.hpp b/include/geode/mesh/io/regular_grid_input.hpp
@@ -72,8 +72,8 @@ namespace geode
     ALIAS_2D_AND_3D( RegularGridInput );
 
     template < index_t dimension >
-    [[nodiscard]] typename RegularGridInput< dimension >::AdditionalFiles
-        regular_grid_additional_files( std::string_view filename );
+    [[nodiscard]] AdditionalFiles regular_grid_additional_files(
+        std::string_view filename );
 
     template < index_t dimension >
     [[nodiscard]] Percentage is_regular_grid_loadable(
diff --git a/include/geode/mesh/io/tetrahedral_solid_input.hpp b/include/geode/mesh/io/tetrahedral_solid_input.hpp
@@ -74,8 +74,8 @@ namespace geode
     ALIAS_3D( TetrahedralSolidInput );
 
     template < index_t dimension >
-    [[nodiscard]] typename TetrahedralSolidInput< dimension >::AdditionalFiles
-        tetrahedral_solid_additional_files( std::string_view filename );
+    [[nodiscard]] AdditionalFiles tetrahedral_solid_additional_files(
+        std::string_view filename );
 
     template < index_t dimension >
     [[nodiscard]] Percentage is_tetrahedral_solid_loadable(
diff --git a/include/geode/mesh/io/triangulated_surface_input.hpp b/include/geode/mesh/io/triangulated_surface_input.hpp
@@ -75,8 +75,8 @@ namespace geode
 
     template < index_t dimension >
     [[nodiscard]]
-    typename TriangulatedSurfaceInput< dimension >::AdditionalFiles
-        triangulated_surface_additional_files( std::string_view filename );
+    AdditionalFiles triangulated_surface_additional_files(
+        std::string_view filename );
 
     template < index_t dimension >
     [[nodiscard]] Percentage is_triangulated_surface_loadable(
diff --git a/include/geode/mesh/io/vertex_set_input.hpp b/include/geode/mesh/io/vertex_set_input.hpp
@@ -66,7 +66,7 @@ namespace geode
         }
     };
 
-    [[nodiscard]] typename VertexSetInput::AdditionalFiles opengeode_mesh_api
+    [[nodiscard]] AdditionalFiles opengeode_mesh_api
         vertex_set_additional_files( std::string_view filename );
 
     [[nodiscard]] Percentage opengeode_mesh_api is_vertex_set_loadable(
diff --git a/include/geode/model/representation/io/brep_input.hpp b/include/geode/model/representation/io/brep_input.hpp
@@ -56,8 +56,8 @@ namespace geode
         }
     };
 
-    [[nodiscard]] typename BRepInput::AdditionalFiles opengeode_model_api
-        brep_additional_files( std::string_view filename );
+    [[nodiscard]] AdditionalFiles opengeode_model_api brep_additional_files(
+        std::string_view filename );
 
     [[nodiscard]] Percentage opengeode_model_api is_brep_loadable(
         std::string_view filename );
diff --git a/include/geode/model/representation/io/section_input.hpp b/include/geode/model/representation/io/section_input.hpp
@@ -56,8 +56,8 @@ namespace geode
         }
     };
 
-    [[nodiscard]] typename SectionInput::AdditionalFiles opengeode_model_api
-        section_additional_files( std::string_view filename );
+    [[nodiscard]] AdditionalFiles opengeode_model_api section_additional_files(
+        std::string_view filename );
 
     [[nodiscard]] Percentage opengeode_model_api is_section_loadable(
         std::string_view filename );
diff --git a/src/geode/image/io/raster_image_input.cpp b/src/geode/image/io/raster_image_input.cpp
@@ -51,8 +51,7 @@ namespace geode
     }
 
     template < index_t dimension >
-    typename RasterImageInput< dimension >::AdditionalFiles
-        raster_image_additional_files( std::string_view filename )
+    AdditionalFiles raster_image_additional_files( std::string_view filename )
     {
         const auto input = detail::geode_object_input_reader<
             RasterImageInputFactory< dimension > >( filename );
@@ -80,9 +79,9 @@ namespace geode
     template RasterImage< 3 > opengeode_image_api load_raster_image(
         std::string_view );
 
-    template RasterImageInput< 2 >::AdditionalFiles opengeode_image_api
+    template AdditionalFiles opengeode_image_api
         raster_image_additional_files< 2 >( std::string_view );
-    template RasterImageInput< 3 >::AdditionalFiles opengeode_image_api
+    template AdditionalFiles opengeode_image_api
         raster_image_additional_files< 3 >( std::string_view );
 
     template Percentage opengeode_image_api is_raster_image_loadable< 2 >(
diff --git a/src/geode/mesh/io/edged_curve_input.cpp b/src/geode/mesh/io/edged_curve_input.cpp
@@ -73,8 +73,7 @@ namespace geode
     }
 
     template < index_t dimension >
-    typename EdgedCurveInput< dimension >::AdditionalFiles
-        edged_curve_additional_files( std::string_view filename )
+    AdditionalFiles edged_curve_additional_files( std::string_view filename )
     {
         const auto input = detail::geode_object_input_reader<
             EdgedCurveInputFactory< dimension > >( filename );
@@ -114,9 +113,9 @@ namespace geode
     template std::unique_ptr< EdgedCurve< 3 > >
         opengeode_mesh_api load_edged_curve( std::string_view );
 
-    template EdgedCurveInput< 2 >::AdditionalFiles opengeode_mesh_api
+    template AdditionalFiles opengeode_mesh_api
         edged_curve_additional_files< 2 >( std::string_view );
-    template EdgedCurveInput< 3 >::AdditionalFiles opengeode_mesh_api
+    template AdditionalFiles opengeode_mesh_api
         edged_curve_additional_files< 3 >( std::string_view );
 
     template Percentage opengeode_mesh_api is_edged_curve_loadable< 2 >(
diff --git a/src/geode/mesh/io/graph_input.cpp b/src/geode/mesh/io/graph_input.cpp
@@ -64,8 +64,7 @@ namespace geode
             MeshFactory::default_impl( Graph::type_name_static() ), filename );
     }
 
-    typename GraphInput::AdditionalFiles graph_additional_files(
-        std::string_view filename )
+    AdditionalFiles graph_additional_files( std::string_view filename )
     {
         const auto input =
             detail::geode_object_input_reader< GraphInputFactory >( filename );
diff --git a/src/geode/mesh/io/hybrid_solid_input.cpp b/src/geode/mesh/io/hybrid_solid_input.cpp
@@ -73,8 +73,7 @@ namespace geode
     }
 
     template < index_t dimension >
-    typename HybridSolidInput< dimension >::AdditionalFiles
-        hybrid_solid_additional_files( std::string_view filename )
+    AdditionalFiles hybrid_solid_additional_files( std::string_view filename )
     {
         const auto input = detail::geode_object_input_reader<
             HybridSolidInputFactory< dimension > >( filename );
@@ -110,7 +109,7 @@ namespace geode
     template std::unique_ptr< HybridSolid< 3 > >
         opengeode_mesh_api load_hybrid_solid( std::string_view );
 
-    template HybridSolidInput< 3 >::AdditionalFiles opengeode_mesh_api
+    template AdditionalFiles opengeode_mesh_api
         hybrid_solid_additional_files< 3 >( std::string_view );
 
     template Percentage opengeode_mesh_api is_hybrid_solid_loadable< 3 >(
diff --git a/src/geode/mesh/io/light_regular_grid_input.cpp b/src/geode/mesh/io/light_regular_grid_input.cpp
@@ -61,8 +61,8 @@ namespace geode
     }
 
     template < index_t dimension >
-    typename LightRegularGridInput< dimension >::AdditionalFiles
-        light_regular_grid_additional_files( std::string_view filename )
+    AdditionalFiles light_regular_grid_additional_files(
+        std::string_view filename )
     {
         const auto input = detail::geode_object_input_reader<
             LightRegularGridInputFactory< dimension > >( filename );
@@ -100,9 +100,9 @@ namespace geode
     template class opengeode_mesh_api LightRegularGridInput< 2 >;
     template class opengeode_mesh_api LightRegularGridInput< 3 >;
 
-    template LightRegularGridInput< 2 >::AdditionalFiles opengeode_mesh_api
+    template AdditionalFiles opengeode_mesh_api
         light_regular_grid_additional_files< 2 >( std::string_view );
-    template LightRegularGridInput< 3 >::AdditionalFiles opengeode_mesh_api
+    template AdditionalFiles opengeode_mesh_api
         light_regular_grid_additional_files< 3 >( std::string_view );
 
     template Percentage opengeode_mesh_api is_light_regular_grid_loadable< 2 >(
diff --git a/src/geode/mesh/io/point_set_input.cpp b/src/geode/mesh/io/point_set_input.cpp
@@ -73,8 +73,7 @@ namespace geode
     }
 
     template < index_t dimension >
-    typename PointSetInput< dimension >::AdditionalFiles
-        point_set_additional_files( std::string_view filename )
+    AdditionalFiles point_set_additional_files( std::string_view filename )
     {
         const auto input = detail::geode_object_input_reader<
             PointSetInputFactory< dimension > >( filename );
@@ -114,10 +113,10 @@ namespace geode
     template std::unique_ptr< PointSet< 3 > > opengeode_mesh_api load_point_set(
         std::string_view );
 
-    template PointSetInput< 2 >::AdditionalFiles
-        opengeode_mesh_api point_set_additional_files< 2 >( std::string_view );
-    template PointSetInput< 3 >::AdditionalFiles
-        opengeode_mesh_api point_set_additional_files< 3 >( std::string_view );
+    template AdditionalFiles opengeode_mesh_api point_set_additional_files< 2 >(
+        std::string_view );
+    template AdditionalFiles opengeode_mesh_api point_set_additional_files< 3 >(
+        std::string_view );
 
     template Percentage opengeode_mesh_api is_point_set_loadable< 2 >(
         std::string_view );
diff --git a/src/geode/mesh/io/polygonal_surface_input.cpp b/src/geode/mesh/io/polygonal_surface_input.cpp
@@ -75,8 +75,8 @@ namespace geode
     }
 
     template < index_t dimension >
-    typename PolygonalSurfaceInput< dimension >::AdditionalFiles
-        polygonal_surface_additional_files( std::string_view filename )
+    AdditionalFiles polygonal_surface_additional_files(
+        std::string_view filename )
     {
         const auto input = detail::geode_object_input_reader<
             PolygonalSurfaceInputFactory< dimension > >( filename );
@@ -116,9 +116,9 @@ namespace geode
     template std::unique_ptr< PolygonalSurface< 3 > >
         opengeode_mesh_api load_polygonal_surface( std::string_view );
 
-    template PolygonalSurfaceInput< 2 >::AdditionalFiles opengeode_mesh_api
+    template AdditionalFiles opengeode_mesh_api
         polygonal_surface_additional_files< 2 >( std::string_view );
-    template PolygonalSurfaceInput< 3 >::AdditionalFiles opengeode_mesh_api
+    template AdditionalFiles opengeode_mesh_api
         polygonal_surface_additional_files< 3 >( std::string_view );
 
     template Percentage opengeode_mesh_api is_polygonal_surface_loadable< 2 >(
diff --git a/src/geode/mesh/io/polyhedral_solid_input.cpp b/src/geode/mesh/io/polyhedral_solid_input.cpp
@@ -74,8 +74,8 @@ namespace geode
     }
 
     template < index_t dimension >
-    typename PolyhedralSolidInput< dimension >::AdditionalFiles
-        polyhedral_solid_additional_files( std::string_view filename )
+    AdditionalFiles polyhedral_solid_additional_files(
+        std::string_view filename )
     {
         const auto input = detail::geode_object_input_reader<
             PolyhedralSolidInputFactory< dimension > >( filename );
@@ -111,7 +111,7 @@ namespace geode
     template std::unique_ptr< PolyhedralSolid< 3 > >
         opengeode_mesh_api load_polyhedral_solid( std::string_view );
 
-    template PolyhedralSolidInput< 3 >::AdditionalFiles opengeode_mesh_api
+    template AdditionalFiles opengeode_mesh_api
         polyhedral_solid_additional_files< 3 >( std::string_view );
 
     template Percentage opengeode_mesh_api is_polyhedral_solid_loadable< 3 >(
diff --git a/src/geode/mesh/io/regular_grid_input.cpp b/src/geode/mesh/io/regular_grid_input.cpp
@@ -73,8 +73,7 @@ namespace geode
     }
 
     template < index_t dimension >
-    typename RegularGridInput< dimension >::AdditionalFiles
-        regular_grid_additional_files( std::string_view filename )
+    AdditionalFiles regular_grid_additional_files( std::string_view filename )
     {
         const auto input = detail::geode_object_input_reader<
             RegularGridInputFactory< dimension > >( filename );
@@ -114,9 +113,9 @@ namespace geode
     template std::unique_ptr< RegularGrid< 3 > >
         opengeode_mesh_api load_regular_grid( std::string_view );
 
-    template RegularGridInput< 2 >::AdditionalFiles opengeode_mesh_api
+    template AdditionalFiles opengeode_mesh_api
         regular_grid_additional_files< 2 >( std::string_view );
-    template RegularGridInput< 3 >::AdditionalFiles opengeode_mesh_api
+    template AdditionalFiles opengeode_mesh_api
         regular_grid_additional_files< 3 >( std::string_view );
 
     template Percentage opengeode_mesh_api is_regular_grid_loadable< 2 >(
diff --git a/src/geode/mesh/io/tetrahedral_solid_input.cpp b/src/geode/mesh/io/tetrahedral_solid_input.cpp
@@ -76,8 +76,8 @@ namespace geode
     }
 
     template < index_t dimension >
-    typename TetrahedralSolidInput< dimension >::AdditionalFiles
-        tetrahedral_solid_additional_files( std::string_view filename )
+    AdditionalFiles tetrahedral_solid_additional_files(
+        std::string_view filename )
     {
         const auto input = detail::geode_object_input_reader<
             TetrahedralSolidInputFactory< dimension > >( filename );
@@ -113,7 +113,7 @@ namespace geode
     template std::unique_ptr< TetrahedralSolid< 3 > >
         opengeode_mesh_api load_tetrahedral_solid( std::string_view );
 
-    template TetrahedralSolidInput< 3 >::AdditionalFiles opengeode_mesh_api
+    template AdditionalFiles opengeode_mesh_api
         tetrahedral_solid_additional_files< 3 >( std::string_view );
 
     template Percentage opengeode_mesh_api is_tetrahedral_solid_loadable< 3 >(
diff --git a/src/geode/mesh/io/triangulated_surface_input.cpp b/src/geode/mesh/io/triangulated_surface_input.cpp
diff --git a/src/geode/mesh/io/vertex_set_input.cpp b/src/geode/mesh/io/vertex_set_input.cpp
diff --git a/src/geode/model/representation/io/brep_input.cpp b/src/geode/model/representation/io/brep_input.cpp
diff --git a/src/geode/model/representation/io/section_input.cpp b/src/geode/model/representation/io/section_input.cpp

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,7 @@ namespace geode`
`62`	`62`	`return image;`
`63`	`63`	`}`
`64`	`64`
`65`		`- typename RasterImageInput< dimension >::AdditionalFiles`
`66`		`- additional_files() const final`
	`65`	`+ AdditionalFiles additional_files() const final`
`67`	`66`	`{`
`68`	`67`	`return {};`
`69`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,7 @@ namespace geode`
`81`	`81`	`return grid;`
`82`	`82`	`}`
`83`	`83`
`84`		`- typename LightRegularGridInput< dimension >::AdditionalFiles`
`85`		`- additional_files() const override`
	`84`	`+ AdditionalFiles additional_files() const override`
`86`	`85`	`{`
`87`	`86`	`return {};`
`88`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,8 @@ namespace geode`
`65`	`65`	`}`
`66`	`66`	`};`
`67`	`67`
`68`		`- [[nodiscard]] typename GraphInput::AdditionalFiles opengeode_mesh_api`
`69`		`- graph_additional_files( std::string_view filename );`
	`68`	`+ [[nodiscard]] AdditionalFiles opengeode_mesh_api graph_additional_files(`
	`69`	`+ std::string_view filename );`
`70`	`70`
`71`	`71`	`[[nodiscard]] Percentage opengeode_mesh_api is_graph_loadable(`
`72`	`72`	`std::string_view filename );`