mirror of
https://github.com/BlackMATov/meta.hpp.git
synced 2025-12-16 22:17:02 +07:00
fix untests
This commit is contained in:
@@ -105,14 +105,13 @@ namespace meta_hpp
|
|||||||
class value final {
|
class value final {
|
||||||
public:
|
public:
|
||||||
value() = default;
|
value() = default;
|
||||||
|
~value() = default;
|
||||||
|
|
||||||
value(value&& other) noexcept = default;
|
value(value&& other) = default;
|
||||||
value(const value& other) = default;
|
value(const value& other) = default;
|
||||||
|
|
||||||
value& operator=(value&& other) noexcept;
|
value& operator=(value&& other) = default;
|
||||||
value& operator=(const value& other);
|
value& operator=(const value& other) = default;
|
||||||
|
|
||||||
~value() = default;
|
|
||||||
|
|
||||||
template < detail::decay_non_uvalue_kind T >
|
template < detail::decay_non_uvalue_kind T >
|
||||||
requires detail::stdex::copy_constructible<std::decay_t<T>>
|
requires detail::stdex::copy_constructible<std::decay_t<T>>
|
||||||
|
|||||||
@@ -107,22 +107,6 @@ namespace meta_hpp
|
|||||||
|
|
||||||
namespace meta_hpp
|
namespace meta_hpp
|
||||||
{
|
{
|
||||||
inline value& value::operator=(value&& other) noexcept {
|
|
||||||
if ( this != &other ) {
|
|
||||||
value temp{std::move(other)};
|
|
||||||
swap(temp);
|
|
||||||
}
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline value& value::operator=(const value& other) {
|
|
||||||
if ( this != &other ) {
|
|
||||||
value temp{other};
|
|
||||||
swap(temp);
|
|
||||||
}
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
template < detail::decay_non_uvalue_kind T >
|
template < detail::decay_non_uvalue_kind T >
|
||||||
requires detail::stdex::copy_constructible<std::decay_t<T>>
|
requires detail::stdex::copy_constructible<std::decay_t<T>>
|
||||||
value::value(T&& val)
|
value::value(T&& val)
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ namespace
|
|||||||
int x{};
|
int x{};
|
||||||
int y{};
|
int y{};
|
||||||
|
|
||||||
ivec2() = default;
|
ivec2() = delete;
|
||||||
explicit ivec2(int v): x{v}, y{v} {}
|
explicit ivec2(int v): x{v}, y{v} {}
|
||||||
ivec2(int x, int y): x{x}, y{y} {}
|
ivec2(int x, int y): x{x}, y{y} {}
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@ namespace
|
|||||||
int y{};
|
int y{};
|
||||||
int z{};
|
int z{};
|
||||||
|
|
||||||
ivec3() = default;
|
ivec3() = delete;
|
||||||
explicit ivec3(int v): x{v}, y{v}, z{v} {}
|
explicit ivec3(int v): x{v}, y{v}, z{v} {}
|
||||||
ivec3(int x, int y, int z): x{x}, y{y}, z{z} {}
|
ivec3(int x, int y, int z): x{x}, y{y}, z{z} {}
|
||||||
};
|
};
|
||||||
@@ -73,7 +73,6 @@ TEST_CASE("meta/meta_utilities/value/ivec2") {
|
|||||||
namespace meta = meta_hpp;
|
namespace meta = meta_hpp;
|
||||||
|
|
||||||
meta::class_<ivec2>()
|
meta::class_<ivec2>()
|
||||||
.ctor_<>()
|
|
||||||
.ctor_<int>()
|
.ctor_<int>()
|
||||||
.ctor_<int, int>()
|
.ctor_<int, int>()
|
||||||
.ctor_<ivec2&&>()
|
.ctor_<ivec2&&>()
|
||||||
@@ -86,7 +85,6 @@ TEST_CASE("meta/meta_utilities/value/ivec3") {
|
|||||||
namespace meta = meta_hpp;
|
namespace meta = meta_hpp;
|
||||||
|
|
||||||
meta::class_<ivec3>()
|
meta::class_<ivec3>()
|
||||||
.ctor_<>()
|
|
||||||
.ctor_<int>()
|
.ctor_<int>()
|
||||||
.ctor_<int, int, int>()
|
.ctor_<int, int, int>()
|
||||||
.ctor_<ivec3&&>()
|
.ctor_<ivec3&&>()
|
||||||
@@ -362,7 +360,7 @@ TEST_CASE("meta/meta_utilities/value") {
|
|||||||
|
|
||||||
val_dst = std::move(val_src2);
|
val_dst = std::move(val_src2);
|
||||||
CHECK(val_dst == ivec2{1,2});
|
CHECK(val_dst == ivec2{1,2});
|
||||||
CHECK(ivec2::move_ctor_counter == 4);
|
CHECK(ivec2::move_ctor_counter == 3);
|
||||||
CHECK(ivec2::copy_ctor_counter == 0);
|
CHECK(ivec2::copy_ctor_counter == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -381,7 +379,7 @@ TEST_CASE("meta/meta_utilities/value") {
|
|||||||
|
|
||||||
val_dst = val_src2;
|
val_dst = val_src2;
|
||||||
CHECK(val_dst == ivec2{1,2});
|
CHECK(val_dst == ivec2{1,2});
|
||||||
CHECK(ivec2::move_ctor_counter == 3);
|
CHECK(ivec2::move_ctor_counter == 2);
|
||||||
CHECK(ivec2::copy_ctor_counter == 1);
|
CHECK(ivec2::copy_ctor_counter == 1);
|
||||||
|
|
||||||
CHECK(val_src2 == ivec2{1,2});
|
CHECK(val_src2 == ivec2{1,2});
|
||||||
|
|||||||
Reference in New Issue
Block a user