diff options
| -rw-r--r-- | lib/converters.h | 4 | ||||
| -rw-r--r-- | lib/function_traits.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/converters.h b/lib/converters.h index 90349019..9c3d5749 100644 --- a/lib/converters.h +++ b/lib/converters.h @@ -27,8 +27,8 @@ struct JsonObjectConverter { //! \brief The switchboard for extra conversion algorithms behind from/toJson //! //! This template is mainly intended for partial conversion specialisations -//! since from/toJson are functions and cannot be partially specialised; -//! another case for JsonConverter is to insulate types that can be constructed +//! since from/toJson are functions and cannot be partially specialised. +//! Another case for JsonConverter is to insulate types that can be constructed //! from basic types - namely, QVariant and QUrl can be directly constructed //! from QString and having an overload or specialisation for those leads to //! ambiguity between these and QJsonValue. For trivial (converting diff --git a/lib/function_traits.cpp b/lib/function_traits.cpp index 4ff427e4..20bcf30e 100644 --- a/lib/function_traits.cpp +++ b/lib/function_traits.cpp @@ -8,11 +8,11 @@ using namespace Quotient; int f_(); -static_assert(std::is_same<fn_return_t<decltype(f_)>, int>::value, +static_assert(std::is_same_v<fn_return_t<decltype(f_)>, int>, "Test fn_return_t<>"); void f1_(int, float); -static_assert(std::is_same<fn_arg_t<decltype(f1_), 1>, float>::value, +static_assert(std::is_same_v<fn_arg_t<decltype(f1_), 1>, float>, "Test fn_arg_t<>"); struct Fo { @@ -43,7 +43,7 @@ static_assert(std::is_same_v<fn_return_t<decltype(&Fo::field2)>, const double&>, struct Fo1 { void operator()(int); }; -static_assert(std::is_same<fn_arg_t<Fo1>, int>(), +static_assert(std::is_same_v<fn_arg_t<Fo1>, int>, "Test fn_arg_t defaulting to first argument"); template <typename T> |