Skip to content

Commit 8edd2f7

Browse files
committed
Merge branch 'fix/explicit_keyword_on_point_and_vector' of github.com:Geode-solutions/OpenGeode into fix_v15/solid_mesh_missing_include_and_bitsery_git_tag_change
2 parents cb135f7 + 0cdb504 commit 8edd2f7

File tree

174 files changed

+825
-638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+825
-638
lines changed

include/geode/basic/uuid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ namespace geode
103103
{
104104
public:
105105
uuid();
106-
uuid( absl::string_view string );
106+
explicit uuid( absl::string_view string );
107107
uuid( const uuid & ) = default;
108108
uuid( uuid && ) = default;
109109
uuid &operator=( uuid &&other ) = default;

include/geode/geometry/aabb.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ namespace geode
5555
* tree which should match the index in its initial container.
5656
*/
5757
AABBTree();
58-
AABBTree( absl::Span< const BoundingBox< dimension > > bboxes );
58+
explicit AABBTree(
59+
absl::Span< const BoundingBox< dimension > > bboxes );
5960
AABBTree( AABBTree&& other ) noexcept;
6061
~AABBTree();
6162

include/geode/geometry/basic_objects/infinite_line.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ namespace geode
4848
public:
4949
GenericLine( const Vector< dimension >& direction, PointType origin );
5050

51-
GenericLine( const GenericSegment< PointType, dimension >& segment );
51+
explicit GenericLine(
52+
const GenericSegment< PointType, dimension >& segment );
5253
GenericLine( const GenericLine< PointType, dimension >& other );
5354
GenericLine< PointType, dimension >& operator=(
5455
const GenericLine< PointType, dimension >& other );

include/geode/geometry/frame.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ namespace geode
3333
{
3434
public:
3535
Frame();
36-
Frame( std::array< Vector< dimension >, dimension > directions );
36+
explicit Frame(
37+
std::array< Vector< dimension >, dimension > directions );
3738

3839
const Vector< dimension >& direction( local_index_t index ) const;
3940

include/geode/geometry/nn_search.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ namespace geode
6060
};
6161

6262
public:
63-
NNSearch( std::vector< Point< dimension > > points );
63+
explicit NNSearch( std::vector< Point< dimension > > points );
6464
NNSearch( NNSearch&& other ) noexcept;
6565
~NNSearch();
6666

include/geode/geometry/point.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace geode
5252
values_.fill( 0 );
5353
}
5454

55-
Point( std::array< double, dimension > values )
55+
explicit Point( std::array< double, dimension > values )
5656
: values_( std::move( values ) )
5757
{
5858
}

include/geode/geometry/vector.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ namespace geode
3939
public:
4040
Vector() = default;
4141

42-
Vector( const Point< dimension > &vector )
42+
explicit Vector( const Point< dimension > &vector )
4343
: Point< dimension >( vector )
4444
{
4545
}
4646

47-
Vector( std::array< double, dimension > values )
47+
explicit Vector( std::array< double, dimension > values )
4848
: Point< dimension >( std::move( values ) )
4949
{
5050
}

include/geode/image/core/greyscale_color.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace geode
4444
value_ = 0;
4545
}
4646

47-
GreyscaleColor( local_index_t value ) : value_( value ) {}
47+
explicit GreyscaleColor( local_index_t value ) : value_( value ) {}
4848

4949
local_index_t value() const
5050
{
@@ -68,7 +68,7 @@ namespace geode
6868

6969
GreyscaleColor operator+( const GreyscaleColor &other ) const
7070
{
71-
return { static_cast< geode::local_index_t >(
71+
return GreyscaleColor{ static_cast< geode::local_index_t >(
7272
value() / 2 + other.value() / 2 ) };
7373
}
7474

@@ -111,7 +111,7 @@ namespace geode
111111
result += attribute.value( interpolator.indices_[i] ).value()
112112
* interpolator.lambdas_[i];
113113
}
114-
return { result };
114+
return GreyscaleColor{ result };
115115
}
116116
};
117117

include/geode/image/core/raster_image.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ namespace geode
4646
using CellIndices = typename CellArray< dimension >::CellIndices;
4747

4848
RasterImage();
49-
RasterImage( std::array< index_t, dimension > cells_number );
49+
explicit RasterImage( std::array< index_t, dimension > cells_number );
5050
RasterImage( RasterImage&& other ) noexcept;
5151
RasterImage& operator=( RasterImage&& other ) noexcept;
5252
~RasterImage();

include/geode/mesh/builder/coordinate_reference_system_manager_builder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace geode
3737
class CoordinateReferenceSystemManagerBuilder
3838
{
3939
public:
40-
CoordinateReferenceSystemManagerBuilder(
40+
explicit CoordinateReferenceSystemManagerBuilder(
4141
CoordinateReferenceSystemManager< dimension >& crs_manager )
4242
: crs_manager_( crs_manager )
4343
{

0 commit comments

Comments
 (0)