Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 6 additions & 9 deletions include/sqlgen/ForeignKey.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,12 @@ struct ForeignKey {

ForeignKey(const ForeignKey& _other) = default;

template <class U,
typename std::enable_if<std::is_convertible_v<U, ReflectionType>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, ReflectionType>
ForeignKey(const U& _value) : value_(_value) {}

template <class U,
typename std::enable_if<std::is_convertible_v<U, ReflectionType>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, ReflectionType>
ForeignKey(U&& _value) noexcept : value_(std::forward<U>(_value)) {}

~ForeignKey() = default;
Expand All @@ -78,9 +76,8 @@ struct ForeignKey {
}

/// Assigns the underlying object.
template <class U,
typename std::enable_if<std::is_convertible_v<U, ReflectionType>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, ReflectionType>
auto& operator=(const U& _value) {
value_ = _value;
return *this;
Expand Down
16 changes: 8 additions & 8 deletions include/sqlgen/JSON.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ class JSON {
template <class U>
JSON(JSON<U>&& _other) : value_(_other.get()) {}

template <class U, typename std::enable_if<std::is_convertible_v<U, T>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, T>
JSON(const U& _value) : value_(_value) {}

template <class U, typename std::enable_if<std::is_convertible_v<U, T>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, T>
JSON(U&& _value) noexcept : value_(std::forward<U>(_value)) {}

template <class U, typename std::enable_if<std::is_convertible_v<U, T>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, T>
JSON(const JSON<U>& _other) : value_(_other.value()) {}

~JSON() = default;
Expand All @@ -60,8 +60,8 @@ class JSON {
}

/// Assigns the underlying object.
template <class U, typename std::enable_if<std::is_convertible_v<U, T>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, T>
auto& operator=(const U& _value) {
value_ = _value;
return *this;
Expand Down
20 changes: 8 additions & 12 deletions include/sqlgen/PrimaryKey.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,16 @@ struct PrimaryKey {
template <class U, bool _other_auto_incr>
PrimaryKey(PrimaryKey<U, _other_auto_incr>&& _other) : value_(_other.get()) {}

template <class U,
typename std::enable_if<std::is_convertible_v<U, ReflectionType>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, ReflectionType>
PrimaryKey(const U& _value) : value_(_value) {}

template <class U,
typename std::enable_if<std::is_convertible_v<U, ReflectionType>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, ReflectionType>
PrimaryKey(U&& _value) noexcept : value_(std::forward<U>(_value)) {}

template <class U,
typename std::enable_if<std::is_convertible_v<U, ReflectionType>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, ReflectionType>
PrimaryKey(const PrimaryKey<U>& _other) : value_(_other.value()) {}

~PrimaryKey() = default;
Expand All @@ -72,9 +69,8 @@ struct PrimaryKey {
}

/// Assigns the underlying object.
template <class U,
typename std::enable_if<std::is_convertible_v<U, ReflectionType>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, ReflectionType>
auto& operator=(const U& _value) {
value_ = _value;
return *this;
Expand Down
15 changes: 6 additions & 9 deletions include/sqlgen/Unique.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@ struct Unique {

Unique(const Unique& _other) = default;

template <class U,
typename std::enable_if<std::is_convertible_v<U, ReflectionType>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, ReflectionType>
Unique(const U& _value) : value_(_value) {}

template <class U,
typename std::enable_if<std::is_convertible_v<U, ReflectionType>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, ReflectionType>
Unique(U&& _value) noexcept : value_(std::forward<U>(_value)) {}

~Unique() = default;
Expand All @@ -56,9 +54,8 @@ struct Unique {
}

/// Assigns the underlying object.
template <class U,
typename std::enable_if<std::is_convertible_v<U, ReflectionType>,
bool>::type = true>
template <class U>
requires std::is_convertible_v<U, ReflectionType>
auto& operator=(const U& _value) {
value_ = _value;
return *this;
Expand Down
Loading