Skip to content

Feat/add explicit to passkey constructor #1315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BotellaA merged 2 commits into from
Aug 5, 2026
Merged

Feat/add explicit to passkey constructor #1315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d869749
feat(Passkey): add explicit to passkey constructor
BenPinet Aug 4, 2026
7ea4265
Merge branch 'v18' into feat/add_explicit_to_passkey_constructor
BenPinet Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/geode/basic/identifier.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,13 @@

namespace geode
{
class opengeode_basic_api Identifier

Check warning on line 45 in include/geode/basic/identifier.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

include/geode/basic/identifier.hpp:45:31 [cppcoreguidelines-special-member-functions] 

class 'Identifier' defines a destructor, a move constructor and a move assignment operator but does not define a copy constructor or a copy assignment operator
{
PASSKEY( IdentifierBuilder, IdentifierKey /*key*/ );
friend class bitsery::Access;

public:
PASSKEY( IdentifierBuilder, IdentifierKey /*key*/ );

Identifier( Identifier&& other ) noexcept;
~Identifier();

Expand Down
2 changes: 1 addition & 1 deletion include/geode/basic/passkey.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
friend T;

private:
PassKey() = default;
explicit PassKey() = default;
};

#define PASSKEY( Friend, Key /*key*/ ) using Key = geode::PassKey< Friend >

Check warning on line 63 in include/geode/basic/passkey.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

include/geode/basic/passkey.hpp:63:46 [bugprone-macro-parentheses] 

macro argument should be enclosed in parentheses

Check warning on line 63 in include/geode/basic/passkey.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

include/geode/basic/passkey.hpp:63:9 [cppcoreguidelines-macro-usage] 

function-like macro 'PASSKEY' used; consider a 'constexpr' template function

} // namespace geode
2 changes: 1 addition & 1 deletion include/geode/mesh/builder/vertex_set_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
/*!
* Interface class to represent the builder of a VertexSet
*/
class opengeode_mesh_api VertexSetBuilder : public IdentifierBuilder

Check warning on line 47 in include/geode/mesh/builder/vertex_set_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

include/geode/mesh/builder/vertex_set_builder.hpp:47:30 [cppcoreguidelines-special-member-functions] 

class 'VertexSetBuilder' defines a default destructor, a copy constructor, a copy assignment operator and a move constructor but does not define a move assignment operator
{
OPENGEODE_DISABLE_COPY( VertexSetBuilder );
PASSKEY( VertexSet, VertexSetKey /*key*/ );

public:
PASSKEY( VertexSet, VertexSetKey /*key*/ );
VertexSetBuilder( VertexSetBuilder&& ) noexcept = default;

virtual ~VertexSetBuilder() = default;
Expand All @@ -72,7 +72,7 @@
* @param[in] nb Number of vertices to create.
* @return the index of the first created vertex
*/
index_t create_vertices( index_t nb );

Check warning on line 75 in include/geode/mesh/builder/vertex_set_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

include/geode/mesh/builder/vertex_set_builder.hpp:75:42 [readability-identifier-length] 

parameter name 'nb' is too short, expected at least 3 characters

/*!
* Delete a set of vertices.
Expand Down Expand Up @@ -105,7 +105,7 @@
virtual void do_create_vertex() = 0;

private:
virtual void do_create_vertices( index_t nb ) = 0;

Check warning on line 108 in include/geode/mesh/builder/vertex_set_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

include/geode/mesh/builder/vertex_set_builder.hpp:108:50 [readability-identifier-length] 

parameter name 'nb' is too short, expected at least 3 characters

virtual void do_delete_vertices( const std::vector< bool >& to_delete,
absl::Span< const index_t > old2new ) = 0;
Expand Down
4 changes: 2 additions & 2 deletions include/geode/mesh/core/coordinate_reference_system_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
namespace geode
{
template < index_t dimension >
class CoordinateReferenceSystemManager

Check warning on line 48 in include/geode/mesh/core/coordinate_reference_system_manager.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

include/geode/mesh/core/coordinate_reference_system_manager.hpp:48:11 [cppcoreguidelines-special-member-functions] 

class 'CoordinateReferenceSystemManager' defines a destructor and a move constructor but does not define a copy constructor, a copy assignment operator or a move assignment operator
{
PASSKEY( CoordinateReferenceSystemManagerBuilder< dimension >,
CRSManagerKey /*key*/ );
friend class bitsery::Access;

public:
PASSKEY( CoordinateReferenceSystemManagerBuilder< dimension >,
CRSManagerKey /*key*/ );
CoordinateReferenceSystemManager();
CoordinateReferenceSystemManager(
CoordinateReferenceSystemManager&& other ) noexcept;
Expand Down
5 changes: 3 additions & 2 deletions include/geode/mesh/core/coordinate_reference_system_managers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,21 @@
namespace geode
{
template < index_t dimension >
class CoordinateReferenceSystemManagers

Check warning on line 48 in include/geode/mesh/core/coordinate_reference_system_managers.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

include/geode/mesh/core/coordinate_reference_system_managers.hpp:48:11 [cppcoreguidelines-special-member-functions] 

class 'CoordinateReferenceSystemManagers' defines a destructor, a move constructor and a move assignment operator but does not define a copy constructor or a copy assignment operator
{
PASSKEY( CoordinateReferenceSystemManagersBuilder< dimension >,
CRSManagersKey /*key*/ );
friend class bitsery::Access;

public:
PASSKEY( CoordinateReferenceSystemManagersBuilder< dimension >,
CRSManagersKey /*key*/ );

~CoordinateReferenceSystemManagers();

[[nodiscard]] const CoordinateReferenceSystemManager1D&
coordinate_reference_system_manager1D() const;

Check warning on line 59 in include/geode/mesh/core/coordinate_reference_system_managers.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

include/geode/mesh/core/coordinate_reference_system_managers.hpp:59:13 [readability-identifier-naming] 

invalid case style for function 'coordinate_reference_system_manager1D'

[[nodiscard]] const CoordinateReferenceSystemManager2D&
coordinate_reference_system_manager2D() const;

Check warning on line 62 in include/geode/mesh/core/coordinate_reference_system_managers.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

include/geode/mesh/core/coordinate_reference_system_managers.hpp:62:13 [readability-identifier-naming] 

invalid case style for function 'coordinate_reference_system_manager2D'

[[nodiscard]] const CoordinateReferenceSystemManager3D&
coordinate_reference_system_manager3D() const;
Expand Down
4 changes: 2 additions & 2 deletions include/geode/mesh/core/geode/geode_edged_curve.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ namespace geode
class OpenGeodeEdgedCurve : public EdgedCurve< dimension >
{
OPENGEODE_DISABLE_COPY( OpenGeodeEdgedCurve );
PASSKEY(
OpenGeodeEdgedCurveBuilder< dimension >, OGEdgedCurveKey /*key*/ );

public:
PASSKEY(
OpenGeodeEdgedCurveBuilder< dimension >, OGEdgedCurveKey /*key*/ );
using Builder = OpenGeodeEdgedCurveBuilder< dimension >;
static constexpr auto dim = dimension;

Expand Down
4 changes: 1 addition & 3 deletions include/geode/mesh/core/geode/geode_graph.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@ namespace geode
{
class opengeode_mesh_api OpenGeodeGraph : public Graph
{
PASSKEY( OpenGeodeGraphBuilder, OGGraphKey /*key*/ );

public:
using Builder = OpenGeodeGraphBuilder;

PASSKEY( OpenGeodeGraphBuilder, OGGraphKey /*key*/ );
OpenGeodeGraph();
OpenGeodeGraph( BITSERY );
OpenGeodeGraph( OpenGeodeGraph&& other ) noexcept;
Expand Down
4 changes: 2 additions & 2 deletions include/geode/mesh/core/geode/geode_hybrid_solid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ namespace geode
class OpenGeodeHybridSolid : public HybridSolid< dimension >
{
OPENGEODE_DISABLE_COPY( OpenGeodeHybridSolid );
PASSKEY( OpenGeodeHybridSolidBuilder< dimension >,
OGHybridSolidKey /*key*/ );

public:
PASSKEY( OpenGeodeHybridSolidBuilder< dimension >,
OGHybridSolidKey /*key*/ );
using Builder = OpenGeodeHybridSolidBuilder< dimension >;
static constexpr auto dim = dimension;

Expand Down
2 changes: 1 addition & 1 deletion include/geode/mesh/core/geode/geode_point_set.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ namespace geode
class OpenGeodePointSet : public PointSet< dimension >
{
OPENGEODE_DISABLE_COPY( OpenGeodePointSet );
PASSKEY( OpenGeodePointSetBuilder< dimension >, OGPointSetKey /*key*/ );

public:
PASSKEY( OpenGeodePointSetBuilder< dimension >, OGPointSetKey /*key*/ );
using Builder = OpenGeodePointSetBuilder< dimension >;
static constexpr auto dim = dimension;

Expand Down
4 changes: 2 additions & 2 deletions include/geode/mesh/core/geode/geode_polygonal_surface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ namespace geode
class OpenGeodePolygonalSurface : public PolygonalSurface< dimension >
{
OPENGEODE_DISABLE_COPY( OpenGeodePolygonalSurface );
PASSKEY( OpenGeodePolygonalSurfaceBuilder< dimension >,
OGPolygonalSurfaceKey /*key*/ );

public:
PASSKEY( OpenGeodePolygonalSurfaceBuilder< dimension >,
OGPolygonalSurfaceKey /*key*/ );
using Builder = OpenGeodePolygonalSurfaceBuilder< dimension >;
static constexpr auto dim = dimension;

Expand Down
4 changes: 2 additions & 2 deletions include/geode/mesh/core/geode/geode_polyhedral_solid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ namespace geode
class OpenGeodePolyhedralSolid : public PolyhedralSolid< dimension >
{
OPENGEODE_DISABLE_COPY( OpenGeodePolyhedralSolid );
PASSKEY( OpenGeodePolyhedralSolidBuilder< dimension >,
OGPolyhedralSolidKey /*key*/ );

public:
PASSKEY( OpenGeodePolyhedralSolidBuilder< dimension >,
OGPolyhedralSolidKey /*key*/ );
using Builder = OpenGeodePolyhedralSolidBuilder< dimension >;
static constexpr auto dim = dimension;

Expand Down
2 changes: 1 addition & 1 deletion include/geode/mesh/core/geode/geode_regular_grid_solid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ namespace geode
class opengeode_mesh_api OpenGeodeRegularGrid< 3 > : public RegularGrid< 3 >
{
OPENGEODE_DISABLE_COPY( OpenGeodeRegularGrid );
PASSKEY( OpenGeodeRegularGridBuilder< 3 >, OGRegularGridKey /*key*/ );

public:
PASSKEY( OpenGeodeRegularGridBuilder< 3 >, OGRegularGridKey /*key*/ );
using Builder = OpenGeodeRegularGridBuilder< 3 >;
static constexpr index_t dim{ 3 };

Expand Down
2 changes: 1 addition & 1 deletion include/geode/mesh/core/geode/geode_regular_grid_surface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ namespace geode
class opengeode_mesh_api OpenGeodeRegularGrid< 2 > : public RegularGrid< 2 >
{
OPENGEODE_DISABLE_COPY( OpenGeodeRegularGrid );
PASSKEY( OpenGeodeRegularGridBuilder< 2 >, OGRegularGridKey /*key*/ );

public:
PASSKEY( OpenGeodeRegularGridBuilder< 2 >, OGRegularGridKey /*key*/ );
using Builder = OpenGeodeRegularGridBuilder< 2 >;
static constexpr index_t dim{ 2 };

Expand Down
4 changes: 2 additions & 2 deletions include/geode/mesh/core/geode/geode_tetrahedral_solid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ namespace geode
class OpenGeodeTetrahedralSolid : public TetrahedralSolid< dimension >
{
OPENGEODE_DISABLE_COPY( OpenGeodeTetrahedralSolid );
PASSKEY( OpenGeodeTetrahedralSolidBuilder< dimension >,
OGTetrahedralSolidKey /*key*/ );

public:
PASSKEY( OpenGeodeTetrahedralSolidBuilder< dimension >,
OGTetrahedralSolidKey /*key*/ );
using Builder = OpenGeodeTetrahedralSolidBuilder< dimension >;
static constexpr auto dim = dimension;

Expand Down
4 changes: 2 additions & 2 deletions include/geode/mesh/core/geode/geode_triangulated_surface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ namespace geode
class OpenGeodeTriangulatedSurface : public TriangulatedSurface< dimension >
{
OPENGEODE_DISABLE_COPY( OpenGeodeTriangulatedSurface );
PASSKEY( OpenGeodeTriangulatedSurfaceBuilder< dimension >,
OGTriangulatedSurfaceKey /*key*/ );

public:
PASSKEY( OpenGeodeTriangulatedSurfaceBuilder< dimension >,
OGTriangulatedSurfaceKey /*key*/ );
using Builder = OpenGeodeTriangulatedSurfaceBuilder< dimension >;
static constexpr auto dim = dimension;

Expand Down
2 changes: 1 addition & 1 deletion include/geode/mesh/core/graph.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ namespace geode
*/
class opengeode_mesh_api Graph : public VertexSet
{
public:
PASSKEY( GraphBuilder, GraphKey /*key*/ );

public:
using Builder = GraphBuilder;

Graph( BITSERY );
Expand Down
2 changes: 1 addition & 1 deletion include/geode/mesh/core/grid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ namespace geode
class Grid : public CellArray< dimension >
{
OPENGEODE_DISABLE_COPY( Grid );
PASSKEY( GridBuilder< dimension >, GridKey /*key*/ );
friend class bitsery::Access;

public:
PASSKEY( GridBuilder< dimension >, GridKey /*key*/ );
using Builder = GridBuilder< dimension >;
static constexpr auto dim = dimension;
using CellIndices = typename CellArray< dimension >::CellIndices;
Expand Down
2 changes: 1 addition & 1 deletion include/geode/mesh/core/solid_edges.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ namespace geode
{
OPENGEODE_DISABLE_COPY( SolidEdges );
OPENGEODE_TEMPLATE_ASSERT_3D( dimension );
PASSKEY( SolidEdgesBuilder< dimension >, SolidEdgesKey /*key*/ );

public:
PASSKEY( SolidEdgesBuilder< dimension >, SolidEdgesKey /*key*/ );
using Builder = SolidEdgesBuilder< dimension >;
static constexpr auto dim = dimension;

Expand Down
2 changes: 1 addition & 1 deletion include/geode/mesh/core/solid_facets.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ namespace geode
{
OPENGEODE_DISABLE_COPY( SolidFacets );
OPENGEODE_TEMPLATE_ASSERT_3D( dimension );
PASSKEY( SolidFacetsBuilder< dimension >, SolidFacetsKey /*key*/ );

public:
PASSKEY( SolidFacetsBuilder< dimension >, SolidFacetsKey /*key*/ );
using Builder = SolidFacetsBuilder< dimension >;
static constexpr auto dim = dimension;

Expand Down
2 changes: 1 addition & 1 deletion include/geode/mesh/core/solid_mesh.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,9 @@ namespace geode
{
OPENGEODE_DISABLE_COPY( SolidMesh );
OPENGEODE_TEMPLATE_ASSERT_3D( dimension );
PASSKEY( SolidMeshBuilder< dimension >, SolidMeshKey /*key*/ );

public:
PASSKEY( SolidMeshBuilder< dimension >, SolidMeshKey /*key*/ );
using Builder = SolidMeshBuilder< dimension >;
static constexpr auto dim = dimension;
using VerticesAroundVertex = absl::InlinedVector< index_t, 20 >;
Expand Down
2 changes: 1 addition & 1 deletion include/geode/mesh/core/surface_edges.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ namespace geode
class opengeode_mesh_api SurfaceEdges
{
OPENGEODE_DISABLE_COPY( SurfaceEdges );
PASSKEY( SurfaceEdgesBuilder< dimension >, SurfaceEdgesKey /*key*/ );

public:
PASSKEY( SurfaceEdgesBuilder< dimension >, SurfaceEdgesKey /*key*/ );
using Builder = SurfaceEdgesBuilder< dimension >;
static constexpr auto dim = dimension;

Expand Down
2 changes: 1 addition & 1 deletion include/geode/mesh/core/surface_mesh.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ namespace geode
public CoordinateReferenceSystemManagers< dimension >
{
OPENGEODE_DISABLE_COPY( SurfaceMesh );
PASSKEY( SurfaceMeshBuilder< dimension >, SurfaceMeshKey /*key*/ );

public:
PASSKEY( SurfaceMeshBuilder< dimension >, SurfaceMeshKey /*key*/ );
using Builder = SurfaceMeshBuilder< dimension >;
static constexpr auto dim = dimension;
using VerticesAroundVertex = absl::InlinedVector< index_t, 10 >;
Expand Down
2 changes: 1 addition & 1 deletion include/geode/mesh/core/texture_storage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ namespace geode
class TextureStorage
{
friend class bitsery::Access;
PASSKEY( TextureManager< dimension >, TextureManagerKey /*key*/ );

public:
PASSKEY( TextureManager< dimension >, TextureManagerKey /*key*/ );
TextureStorage();
TextureStorage( TextureStorage&& other ) noexcept;
~TextureStorage();
Expand Down
8 changes: 6 additions & 2 deletions include/geode/model/mixin/builder/blocks_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,12 @@ namespace geode
[[nodiscard]] std::unique_ptr< typename Mesh::Builder >
block_mesh_builder( const uuid& id )
{
auto& mesh = blocks_.modifiable_block( id, {} ).modifiable_mesh(
typename Block< dimension >::BlocksBuilderKey{} );
auto& mesh =
blocks_
.modifiable_block(
id, typename Block< dimension >::BlocksBuilderKey{} )
.modifiable_mesh(
typename Block< dimension >::BlocksBuilderKey{} );
return MeshBuilderFactory::create_mesh_builder<
typename Mesh::Builder >( dynamic_cast< Mesh& >( mesh ) );
}
Expand Down
8 changes: 6 additions & 2 deletions include/geode/model/mixin/builder/surfaces_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,12 @@ namespace geode
[[nodiscard]] std::unique_ptr< typename Mesh::Builder >
surface_mesh_builder( const uuid& id )
{
auto& mesh = surfaces_.modifiable_surface( id, {} ).modifiable_mesh(
typename Surface< dimension >::SurfacesBuilderKey{} );
auto& mesh =
surfaces_
.modifiable_surface( id,
typename Surface< dimension >::SurfacesBuilderKey{} )
.modifiable_mesh(
typename Surface< dimension >::SurfacesBuilderKey{} );
return MeshBuilderFactory::create_mesh_builder<
typename Mesh::Builder >( dynamic_cast< Mesh& >( mesh ) );
}
Expand Down
9 changes: 6 additions & 3 deletions include/geode/model/mixin/builder/vertex_identifier_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,15 @@ namespace geode
template < typename MeshComponent >
void register_mesh_component( const MeshComponent& component )
{
vertex_identifier_.register_mesh_component( component, {} );
vertex_identifier_.register_mesh_component(
component, VertexIdentifier::BuilderKey{} );
}

template < typename MeshComponent >
void load_mesh_component( const MeshComponent& component )
{
vertex_identifier_.load_mesh_component( component, {} );
vertex_identifier_.load_mesh_component(
component, VertexIdentifier::BuilderKey{} );
}

/*!
Expand All @@ -60,7 +62,8 @@ namespace geode
template < typename MeshComponent >
void unregister_mesh_component( const MeshComponent& component )
{
vertex_identifier_.unregister_mesh_component( component, {} );
vertex_identifier_.unregister_mesh_component(
component, VertexIdentifier::BuilderKey{} );
}

/*!
Expand Down
4 changes: 2 additions & 2 deletions include/geode/model/mixin/core/block.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ namespace geode
{
OPENGEODE_DISABLE_COPY( Block );
OPENGEODE_TEMPLATE_ASSERT_3D( dimension );
PASSKEY( Blocks< dimension >, BlocksKey /*key*/ );
PASSKEY( BlocksBuilder< dimension >, BlocksBuilderKey /*key*/ );
friend class bitsery::Access;

public:
PASSKEY( Blocks< dimension >, BlocksKey /*key*/ );
PASSKEY( BlocksBuilder< dimension >, BlocksBuilderKey /*key*/ );
using Mesh = SolidMesh< dimension >;

Block( Block&& other ) noexcept;
Expand Down
6 changes: 3 additions & 3 deletions include/geode/model/mixin/core/block_collection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ namespace geode
class BlockCollection : public Component< dimension >
{
OPENGEODE_DISABLE_COPY( BlockCollection );
PASSKEY( BlockCollections< dimension >, BlockCollectionsKey /*key*/ );
PASSKEY( BlockCollectionsBuilder< dimension >,
BlockCollectionsBuilderKey /*key*/ );
friend class bitsery::Access;

public:
PASSKEY( BlockCollections< dimension >, BlockCollectionsKey /*key*/ );
PASSKEY( BlockCollectionsBuilder< dimension >,
BlockCollectionsBuilderKey /*key*/ );
BlockCollection( BlockCollection&& other ) noexcept = default;
~BlockCollection() = default;

Expand Down
4 changes: 2 additions & 2 deletions include/geode/model/mixin/core/block_collections.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ namespace geode
class BlockCollections
{
OPENGEODE_DISABLE_COPY( BlockCollections );
PASSKEY( BlockCollectionsBuilder< dimension >,
BlockCollectionsBuilderKey /*key*/ );

public:
PASSKEY( BlockCollectionsBuilder< dimension >,
BlockCollectionsBuilderKey /*key*/ );
using Builder = BlockCollectionsBuilder< dimension >;
using Type = BlockCollection< dimension >;

Expand Down
2 changes: 1 addition & 1 deletion include/geode/model/mixin/core/blocks.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ namespace geode
{
OPENGEODE_DISABLE_COPY( Blocks );
OPENGEODE_TEMPLATE_ASSERT_3D( dimension );
PASSKEY( BlocksBuilder< dimension >, BlocksBuilderKey /*key*/ );

public:
PASSKEY( BlocksBuilder< dimension >, BlocksBuilderKey /*key*/ );
using Builder = BlocksBuilder< dimension >;
using Type = Block< dimension >;

Expand Down
3 changes: 1 addition & 2 deletions include/geode/model/mixin/core/component_registry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@ namespace geode
{
class opengeode_model_api ComponentRegistry
{
PASSKEY( ComponentRegistryBuilder, RegistryBuilder );

public:
PASSKEY( ComponentRegistryBuilder, RegistryBuilder );
using Registry =
absl::flat_hash_map< ComponentType, std::vector< uuid > >;

Expand Down
Loading
Loading