Skip to content

Commit

Permalink
delete default constexpr
Browse files Browse the repository at this point in the history
  • Loading branch information
AsPJT committed Jun 29, 2019
1 parent 7e053d4 commit af35904
Show file tree
Hide file tree
Showing 38 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion include/DTL/Base/Shogi.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace dtl {
Matrix_Int_ osho{};
Matrix_Int_ gyokusho{};

constexpr ShogiList() = default;
ShogiList() = default;

constexpr explicit ShogiList(
const Matrix_Int_& fuhyo_1_,
Expand Down
10 changes: 5 additions & 5 deletions include/DTL/Base/Struct.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ namespace dtl {
template<typename Int_>
struct Coordinate1Dimensional {
Int_ x{};
constexpr Coordinate1Dimensional() = default;
Coordinate1Dimensional() = default;
constexpr Coordinate1Dimensional(const Int_& x_) noexcept :x(x_) {};
};

template<typename Int_>
struct Coordinate2Dimensional {
Int_ x{};
Int_ y{};
constexpr Coordinate2Dimensional() = default;
Coordinate2Dimensional() = default;
constexpr Coordinate2Dimensional(const Int_& x_, const Int_& y_) noexcept :x(x_), y(y_) {};

constexpr bool operator==(const ::dtl::base::Coordinate2Dimensional<Int_>& vec2_) const noexcept {
Expand All @@ -48,7 +48,7 @@ namespace dtl {
Int_ x{};
Int_ y{};
Int_ z{};
constexpr Coordinate3Dimensional() = default;
Coordinate3Dimensional() = default;
constexpr Coordinate3Dimensional(const Int_& x_, const Int_& y_, const Int_& z_) noexcept :x(x_), y(y_), z(z_) {};

constexpr bool operator==(const ::dtl::base::Coordinate3Dimensional<Int_>& vec3_) const noexcept {
Expand All @@ -67,7 +67,7 @@ namespace dtl {
Int_ y{};
Int_ w{};
Int_ h{};
constexpr Coordinate2DimensionalAndLength2Dimensional() = default;
Coordinate2DimensionalAndLength2Dimensional() = default;
constexpr Coordinate2DimensionalAndLength2Dimensional(const Int_& x_, const Int_& y_) noexcept
:x(x_), y(y_) {};
constexpr Coordinate2DimensionalAndLength2Dimensional(const Int_& x_, const Int_& y_, const Int_& l_) noexcept
Expand Down Expand Up @@ -129,7 +129,7 @@ namespace dtl {
Int_ w{};
Int_ h{};
Int_ d{};
constexpr Coordinate3DimensionalAndLength3Dimensional() = default;
Coordinate3DimensionalAndLength3Dimensional() = default;
constexpr Coordinate3DimensionalAndLength3Dimensional(const Int_& x_, const Int_& y_, const Int_& z_) noexcept
:x(x_), y(y_), z(z_) {};
constexpr Coordinate3DimensionalAndLength3Dimensional(const Int_& x_, const Int_& y_, const Int_& z_, const Int_& l_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Board/WriteNumber.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr WriteNumber() = default;
WriteNumber() = default;

constexpr explicit WriteNumber(const OutputString_& new_line_string_) noexcept
:new_line_string(new_line_string_) {}
Expand Down
6 changes: 3 additions & 3 deletions include/DTL/Camera/MatrixView.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace dtl {
inline namespace camera { //"dtl::camera"名前空間に属する

struct MatrixViewRect {
constexpr MatrixViewRect() = default;
MatrixViewRect() = default;
::std::int_fast32_t start_x{};
::std::int_fast32_t start_y{};
::std::int_fast32_t end_x{};
Expand All @@ -31,7 +31,7 @@ namespace dtl {

class SampleMatrixViewDraw {
public:
constexpr SampleMatrixViewDraw() = default;
SampleMatrixViewDraw() = default;
template<typename Matrix_> //maybe_unused
DTL_VERSIONING_CPP14_CONSTEXPR
void draw(const Matrix_&, const ::std::int_fast32_t, const ::std::int_fast32_t, const ::std::int_fast32_t, const ::std::int_fast32_t, const ::std::int_fast32_t, const ::std::int_fast32_t, const ::std::int_fast32_t, const ::std::int_fast32_t) const noexcept {}
Expand Down Expand Up @@ -83,7 +83,7 @@ namespace dtl {
}

//コンストラクタ
constexpr MatrixView() = default;
MatrixView() = default;
constexpr MatrixView(const ::std::int_fast32_t window_width_, const ::std::int_fast32_t window_height_, const ::std::int_fast32_t pixel_width_, const ::std::int_fast32_t pixel_height_, const double target_x_, const double target_y_) noexcept
:window_width(window_width_),
window_height(window_height_),
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Console/OutputNumber.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr OutputNumber() = default;
OutputNumber() = default;
constexpr explicit OutputNumber(const OutputString_ & draw_string_) noexcept
:after_string(draw_string_) {}
constexpr explicit OutputNumber(const OutputString_ & before_draw_string_, const OutputString_ & draw_string_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Console/OutputString.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr OutputString() = default;
OutputString() = default;
template<typename ...Args_>
explicit OutputString(const OutputStringName_ & first_, const Args_ & ... args_) noexcept {
this->string_String(first_, args_...);
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Console/OutputStringBool.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr OutputStringBool() = default;
OutputStringBool() = default;
constexpr explicit OutputStringBool(const OutputString_ & true_string_) noexcept
:true_string(true_string_) {}
constexpr explicit OutputStringBool(const OutputString_ & true_string_, const OutputString_ & false_string_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Console/OutputView.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr OutputView() = default;
OutputView() = default;
constexpr explicit OutputView(const OutputView_& view_) noexcept
:view_width(view_), view_height(view_) {}
constexpr explicit OutputView(const OutputView_& view_width_, const OutputView_& view_height_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Cuboid/MazeDig3D.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ namespace dtl {
}

//コンストラクタ
constexpr MazeDig3D() = default;
MazeDig3D() = default;
constexpr MazeDig3D(const Matrix_Int_ & empty_value_)
:empty_value(empty_value_) {}
constexpr MazeDig3D(const Matrix_Int_ & empty_value_, const Matrix_Int_ & wall_value_)
Expand Down
6 changes: 3 additions & 3 deletions include/DTL/Deprecated/BoardGame.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ namespace dtl {
class Chess {
public:
//コンストラクタ
constexpr Chess() = default;
Chess() = default;
template<typename Matrix_>
DTL_VERSIONING_CPP14_CONSTEXPR
explicit Chess(Matrix_& matrix_) noexcept {
Expand Down Expand Up @@ -360,7 +360,7 @@ namespace dtl {
class Chess {
public:
//コンストラクタ
constexpr Chess() = default;
Chess() = default;
template<typename Matrix_>
DTL_VERSIONING_CPP14_CONSTEXPR
explicit Chess(Matrix_& matrix_, const ::dtl::type::size x_, const ::dtl::type::size y_) noexcept {
Expand Down Expand Up @@ -550,7 +550,7 @@ namespace dtl {
return true;
}
//コンストラクタ
constexpr KnightTour() = default;
KnightTour() = default;
template<typename Matrix_>
explicit KnightTour(Matrix_ & matrix_, const ::dtl::type::size x_, const ::dtl::type::size y_, const ::dtl::type::size start_x_ = 0, const ::dtl::type::size start_y_ = 0, const bool is_closed_ = false, const Matrix_Int_ mod_value_ = 0) noexcept {
create(matrix_, x_, y_, start_x_, start_y_, is_closed_, mod_value_);
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Deprecated/DungeonPaint.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace dtl {
class Bucket {
public:
//コンストラクタ
constexpr Bucket() = default;
Bucket() = default;
template<typename Matrix_>
DTL_VERSIONING_CPP14_CONSTEXPR
explicit Bucket(Matrix_& matrix_, const ::std::int_fast32_t col_, const ::std::int_fast32_t row_, const Matrix_Int_ paint_value_) noexcept {
Expand Down
6 changes: 3 additions & 3 deletions include/DTL/Deprecated/RogueLike.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace dtl {
//四角形の位置と大きさ
template<typename Matrix_Int_>
struct RogueLikeOutputNumber {
constexpr RogueLikeOutputNumber() = default;
RogueLikeOutputNumber() = default;
//位置
Matrix_Int_ x{}, y{};
//大きさ
Expand All @@ -55,7 +55,7 @@ namespace dtl {
class RogueLike {
public:
//コンストラクタ
constexpr RogueLike() = default;
RogueLike() = default;
template<typename Matrix_>
DTL_VERSIONING_CPP14_CONSTEXPR
explicit RogueLike(Matrix_& matrix_, const ::dtl::type::size way_max_ = 20) noexcept {
Expand Down Expand Up @@ -285,7 +285,7 @@ namespace dtl {
class RogueLikeCave {
public:
//コンストラクタ
constexpr RogueLikeCave() = default;
RogueLikeCave() = default;
template<typename Matrix_>
DTL_VERSIONING_CPP14_CONSTEXPR
explicit RogueLikeCave(Matrix_& matrix_, const ::dtl::type::size way_max_ = 20) noexcept {
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Range/BasicRect.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ namespace dtl {
/*#######################################################################################
[概要] デフォルトのコンストラクタ
#######################################################################################*/
constexpr BasicRect() = default;
BasicRect() = default;

/*#######################################################################################
[概要] 描画範囲指定のコンストラクタ
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Range/BasicRectangular.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr BasicRectangular() = default;
BasicRectangular() = default;
constexpr explicit BasicRectangular(const ::dtl::base::MatrixRange3D & matrix_range_) noexcept
:start_x(matrix_range_.x), start_y(matrix_range_.y), start_z(matrix_range_.z),
size_x(matrix_range_.w), size_y(matrix_range_.h), size_z(matrix_range_.d) {}
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Range/RectBaseDobutsuShogi.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace dtl {
Matrix_Int_ lion_1{};
Matrix_Int_ lion_2{};

constexpr DobutsuShogiList() = default;
DobutsuShogiList() = default;

constexpr explicit DobutsuShogiList(
const Matrix_Int_& chick_1_,
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Range/RectangularBase.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr RectangularBase() = default;
RectangularBase() = default;
constexpr explicit RectangularBase(const ::dtl::base::MatrixRange3D& matrix_range_) noexcept
:RectBase_t(matrix_range_) {}
constexpr explicit RectangularBase(const Index_Size start_x_, const Index_Size start_y_, const Index_Size start_z_, const Index_Size size_x_, const Index_Size size_y_, const Index_Size size_z_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Range/RectangularBaseWithValue.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr RectangularBaseWithValue() = default;
RectangularBaseWithValue() = default;
constexpr explicit RectangularBaseWithValue(const Matrix_Int_& draw_value_) noexcept
:draw_value(draw_value_) {}
constexpr explicit RectangularBaseWithValue(const ::dtl::base::MatrixRange3D& matrix_range_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Shape/CellularAutomatonIsland.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr CellularAutomatonIsland() = default;
CellularAutomatonIsland() = default;
constexpr explicit CellularAutomatonIsland(const Matrix_Int_ & draw_value_) noexcept
:randomRect(draw_value_) {}

Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Shape/CellularAutomatonMixIsland.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr CellularAutomatonMixIsland() = default;
CellularAutomatonMixIsland() = default;
template<typename ...Args_>
explicit CellularAutomatonMixIsland(const Index_Size & loop_num_, const Matrix_Int_ & first_, const Args_ & ... args_) noexcept
:border(first_), mixRect(first_, args_...), loop_num(loop_num_) {}
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Shape/HalfMixRect.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr HalfMixRect() = default;
HalfMixRect() = default;
template<typename ...Args_>
explicit HalfMixRect(const Matrix_Int_ & first_, const Args_ & ... args_) noexcept {
this->string_String(first_, args_...);
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Shape/MazeDig.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr MazeDig() = default;
MazeDig() = default;
constexpr explicit MazeDig(const Matrix_Int_ & empty_value_) noexcept
:empty_value(empty_value_) {}
constexpr explicit MazeDig(const Matrix_Int_& empty_value_, const Matrix_Int_& wall_value_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Shape/MixRect.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr MixRect() = default;
MixRect() = default;
template<typename ...Args_>
explicit MixRect(const Matrix_Int_ & first_, const Args_ & ... args_) noexcept {
this->string_String(first_, args_...);
Expand Down
4 changes: 2 additions & 2 deletions include/DTL/Shape/Point.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ namespace dtl {
class Point {
private:
public:
constexpr Point() = default;
Point() = default;
template<typename Matrix_>
DTL_VERSIONING_CPP14_CONSTEXPR
void draw(Matrix_& matrix_, const ::dtl::type::size x_, const ::dtl::type::size y_) const noexcept {
Expand Down Expand Up @@ -125,7 +125,7 @@ namespace dtl {
class Point {
private:
public:
constexpr Point() = default;
Point() = default;

};

Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Shape/PointGridAndSomeBlocksWithBorder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr PointGridAndSomeBlocksWithBorder() = default;
PointGridAndSomeBlocksWithBorder() = default;
constexpr explicit PointGridAndSomeBlocksWithBorder(const Matrix_Int_& draw_value_) noexcept
:randomRect(draw_value_), borderOdd(draw_value_), pointGrid(draw_value_) {}
constexpr explicit PointGridAndSomeBlocksWithBorder(const Matrix_Int_& draw_value_, const Matrix_Int_& draw_value2_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Shape/PointGridWithBorder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr PointGridWithBorder() = default;
PointGridWithBorder() = default;
constexpr explicit PointGridWithBorder(const Matrix_Int_& draw_value_) noexcept
:borderOdd(draw_value_), pointGrid(draw_value_) {}
constexpr explicit PointGridWithBorder(const Matrix_Int_& draw_value_, const Matrix_Int_& draw_value2_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Shape/RandomRect.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr RandomRect() = default;
RandomRect() = default;
constexpr explicit RandomRect(const Matrix_Int_ & draw_value_) noexcept
:draw_value(draw_value_) {}
constexpr explicit RandomRect(const Matrix_Int_ & draw_value_, const double probability_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Shape/RandomVoronoi.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr RandomVoronoi() = default;
RandomVoronoi() = default;
constexpr explicit RandomVoronoi(const ::dtl::type::size draw_value_) noexcept
:voronoiDiagram(draw_value_) {}
constexpr explicit RandomVoronoi(const ::dtl::type::size draw_value_, const double probability_value_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Shape/Reversi.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr Reversi() = default;
Reversi() = default;
constexpr explicit Reversi(const Matrix_Int_ & black_value_) noexcept
:black_value(black_value_) {}
constexpr explicit Reversi(const Matrix_Int_& black_value_, const Matrix_Int_& white_value_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Shape/SimpleRogueLike.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr SimpleRogueLike() = default;
SimpleRogueLike() = default;
constexpr explicit SimpleRogueLike(const Matrix_Int_& room_value_) noexcept
:room_value(room_value_) {}
constexpr explicit SimpleRogueLike(const Matrix_Int_& room_value_, const Matrix_Int_& road_value_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Shape/SimpleVoronoiIsland.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr SimpleVoronoiIsland() = default;
SimpleVoronoiIsland() = default;
constexpr explicit SimpleVoronoiIsland(const ::dtl::type::size voronoi_num_) noexcept
:voronoiDiagram(voronoi_num_) {}
constexpr explicit SimpleVoronoiIsland(const ::dtl::type::size voronoi_num_, const double probability_value_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Storage/FileSandboxOBJ_3D.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr FileSandboxOBJ_3D() = default;
FileSandboxOBJ_3D() = default;
constexpr explicit FileSandboxOBJ_3D(const ::std::string & write_value_)
:str(write_value_) {}

Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Utility/Binarization.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr Binarization() = default;
Binarization() = default;
constexpr explicit Binarization(const Matrix_Int_ & true_value_) noexcept
:true_value(true_value_) {}
constexpr explicit Binarization(const Matrix_Int_ & true_value_, const Matrix_Int_ & false_value_) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/DTL/Utility/CellularAutomaton.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ namespace dtl {

///// コンストラクタ (Constructor) /////

constexpr CellularAutomation() = default;
CellularAutomation() = default;
constexpr explicit CellularAutomation(const ::dtl::base::MatrixRange & matrix_range_) noexcept
:start_x(matrix_range_.x), start_y(matrix_range_.y),
width(matrix_range_.w), height(matrix_range_.h) {}
Expand Down
Loading

1 comment on commit af35904

@yumetodo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.