Skip to content

Commit df2faa3

Browse files
MelchiorSchuhMelchiorSchuh
committed
fix(Inspector): Removed variadic template parameters on AddInspector for compilation on windows.
1 parent ab89685 commit df2faa3

File tree

9 files changed

+47
-61
lines changed

9 files changed

+47
-61
lines changed

‎include/geode/inspector/edgedcurve_inspector.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ namespace geode
3737
*/
3838
template < index_t dimension >
3939
class opengeode_inspector_inspector_api EdgedCurveInspector
40-
: public AddInspectors< dimension,
41-
EdgedCurve,
42-
EdgedCurveColocation,
43-
EdgedCurveDegeneration >
40+
: public AddInspectors< EdgedCurve< dimension >,
41+
EdgedCurveColocation< dimension >,
42+
EdgedCurveDegeneration< dimension > >
4443
{
4544
OPENGEODE_DISABLE_COPY( EdgedCurveInspector );
4645

‎include/geode/inspector/mixin/add_inspectors.h‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,13 @@ namespace geode
3434
* InspectorClassA, InspectorClassB, InspectorClassC >, public
3535
* OtherOptionalMixins
3636
*/
37-
template < index_t dimension,
38-
template < index_t >
39-
class Mesh,
40-
template < index_t >
41-
class... Inspectors >
42-
class AddInspectors : public Inspectors< dimension >...
37+
template < class Mesh, class... Inspectors >
38+
class AddInspectors : public Inspectors...
4339
{
4440
protected:
45-
AddInspectors( const Mesh< dimension >& mesh )
46-
: Inspectors< dimension >{ mesh }...
47-
{
48-
}
49-
AddInspectors( const Mesh< dimension >& mesh, bool verbose )
50-
: Inspectors< dimension >{ mesh, verbose }...
41+
AddInspectors( const Mesh& mesh ) : Inspectors{ mesh }... {}
42+
AddInspectors( const Mesh& mesh, bool verbose )
43+
: Inspectors{ mesh, verbose }...
5144
{
5245
}
5346
AddInspectors( AddInspectors&& ) = default;

‎include/geode/inspector/pointset_inspector.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ namespace geode
3535
*/
3636
template < index_t dimension >
3737
class opengeode_inspector_inspector_api PointSetInspector
38-
: public AddInspectors< dimension, PointSet, PointSetColocation >
38+
: public AddInspectors< PointSet< dimension >,
39+
PointSetColocation< dimension > >
3940
{
4041
OPENGEODE_DISABLE_COPY( PointSetInspector );
4142

‎include/geode/inspector/solid_inspector.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ namespace geode
3737
*/
3838
template < index_t dimension >
3939
class opengeode_inspector_inspector_api SolidMeshInspector
40-
: public AddInspectors< dimension,
41-
SolidMesh,
42-
SolidMeshColocation,
43-
SolidMeshDegeneration >
40+
: public AddInspectors< SolidMesh< dimension >,
41+
SolidMeshColocation< dimension >,
42+
SolidMeshDegeneration< dimension > >
4443
{
4544
OPENGEODE_DISABLE_COPY( SolidMeshInspector );
4645
OPENGEODE_TEMPLATE_ASSERT_3D( dimension );

‎include/geode/inspector/surface_inspector.h‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,12 @@ namespace geode
4343
*/
4444
template < index_t dimension >
4545
class opengeode_inspector_inspector_api SurfaceMeshInspector
46-
: public AddInspectors< dimension,
47-
SurfaceMesh,
48-
SurfaceMeshAdjacency,
49-
SurfaceMeshColocation,
50-
SurfaceMeshDegeneration,
51-
SurfaceMeshEdgeManifold,
52-
SurfaceMeshVertexManifold >
46+
: public AddInspectors< SurfaceMesh< dimension >,
47+
SurfaceMeshAdjacency< dimension >,
48+
SurfaceMeshColocation< dimension >,
49+
SurfaceMeshDegeneration< dimension >,
50+
SurfaceMeshEdgeManifold< dimension >,
51+
SurfaceMeshVertexManifold< dimension > >
5352
{
5453
OPENGEODE_DISABLE_COPY( SurfaceMeshInspector );
5554

‎src/geode/inspector/edgedcurve_inspector.cpp‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,18 @@ namespace geode
3030
template < index_t dimension >
3131
EdgedCurveInspector< dimension >::EdgedCurveInspector(
3232
const EdgedCurve< dimension >& mesh )
33-
: AddInspectors< dimension,
34-
EdgedCurve,
35-
EdgedCurveColocation,
36-
EdgedCurveDegeneration >{ mesh }
33+
: AddInspectors< EdgedCurve< dimension >,
34+
EdgedCurveColocation< dimension >,
35+
EdgedCurveDegeneration< dimension > >{ mesh }
3736
{
3837
}
3938

4039
template < index_t dimension >
4140
EdgedCurveInspector< dimension >::EdgedCurveInspector(
4241
const EdgedCurve< dimension >& mesh, bool verbose )
43-
: AddInspectors< dimension,
44-
EdgedCurve,
45-
EdgedCurveColocation,
46-
EdgedCurveDegeneration >{ mesh, verbose }
42+
: AddInspectors< EdgedCurve< dimension >,
43+
EdgedCurveColocation< dimension >,
44+
EdgedCurveDegeneration< dimension > >{ mesh, verbose }
4745
{
4846
}
4947

‎src/geode/inspector/pointset_inspector.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,16 @@ namespace geode
3030
template < index_t dimension >
3131
PointSetInspector< dimension >::PointSetInspector(
3232
const PointSet< dimension >& mesh )
33-
: AddInspectors< dimension, PointSet, PointSetColocation >{ mesh }
33+
: AddInspectors< PointSet< dimension >,
34+
PointSetColocation< dimension > >{ mesh }
3435
{
3536
}
3637

3738
template < index_t dimension >
3839
PointSetInspector< dimension >::PointSetInspector(
3940
const PointSet< dimension >& mesh, bool verbose )
40-
: AddInspectors< dimension, PointSet, PointSetColocation >{ mesh,
41-
verbose }
41+
: AddInspectors< PointSet< dimension >,
42+
PointSetColocation< dimension > >{ mesh, verbose }
4243
{
4344
}
4445

‎src/geode/inspector/solid_inspector.cpp‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,18 @@ namespace geode
3030
template < index_t dimension >
3131
SolidMeshInspector< dimension >::SolidMeshInspector(
3232
const SolidMesh< dimension >& mesh )
33-
: AddInspectors< dimension,
34-
SolidMesh,
35-
SolidMeshColocation,
36-
SolidMeshDegeneration >{ mesh }
33+
: AddInspectors< SolidMesh< dimension >,
34+
SolidMeshColocation< dimension >,
35+
SolidMeshDegeneration< dimension > >{ mesh }
3736
{
3837
}
3938

4039
template < index_t dimension >
4140
SolidMeshInspector< dimension >::SolidMeshInspector(
4241
const SolidMesh< dimension >& mesh, bool verbose )
43-
: AddInspectors< dimension,
44-
SolidMesh,
45-
SolidMeshColocation,
46-
SolidMeshDegeneration >{ mesh, verbose }
42+
: AddInspectors< SolidMesh< dimension >,
43+
SolidMeshColocation< dimension >,
44+
SolidMeshDegeneration< dimension > >{ mesh, verbose }
4745
{
4846
}
4947

‎src/geode/inspector/surface_inspector.cpp‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,24 @@ namespace geode
3030
template < index_t dimension >
3131
SurfaceMeshInspector< dimension >::SurfaceMeshInspector(
3232
const SurfaceMesh< dimension >& mesh )
33-
: AddInspectors< dimension,
34-
SurfaceMesh,
35-
SurfaceMeshAdjacency,
36-
SurfaceMeshColocation,
37-
SurfaceMeshDegeneration,
38-
SurfaceMeshEdgeManifold,
39-
SurfaceMeshVertexManifold >{ mesh }
33+
: AddInspectors< SurfaceMesh< dimension >,
34+
SurfaceMeshAdjacency< dimension >,
35+
SurfaceMeshColocation< dimension >,
36+
SurfaceMeshDegeneration< dimension >,
37+
SurfaceMeshEdgeManifold< dimension >,
38+
SurfaceMeshVertexManifold< dimension > >{ mesh }
4039
{
4140
}
4241

4342
template < index_t dimension >
4443
SurfaceMeshInspector< dimension >::SurfaceMeshInspector(
4544
const SurfaceMesh< dimension >& mesh, bool verbose )
46-
: AddInspectors< dimension,
47-
SurfaceMesh,
48-
SurfaceMeshAdjacency,
49-
SurfaceMeshColocation,
50-
SurfaceMeshDegeneration,
51-
SurfaceMeshEdgeManifold,
52-
SurfaceMeshVertexManifold >{ mesh, verbose }
45+
: AddInspectors< SurfaceMesh< dimension >,
46+
SurfaceMeshAdjacency< dimension >,
47+
SurfaceMeshColocation< dimension >,
48+
SurfaceMeshDegeneration< dimension >,
49+
SurfaceMeshEdgeManifold< dimension >,
50+
SurfaceMeshVertexManifold< dimension > >{ mesh, verbose }
5351
{
5452
}
5553

0 commit comments

Comments
 (0)