Added several missing [[nodiscard]]

rollbear · Mar 4, 2024 · d101e70 · d101e70
1 parent da5ab44
commit d101e70
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 12 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,5 @@
+        * Added several missing [[nodiscard]]
+
         * .begin() and .end() are now constexpr for strong::range types. Thanks
           Harald Achitz for reporting the missing specifiers.
 

diff --git a/include/strong_type/arithmetic.hpp b/include/strong_type/arithmetic.hpp
@@ -186,14 +186,14 @@ class std::numeric_limits<strong::type<T, Tag, Ms...>>
 {
     using type = strong::type<T, Tag, Ms...>;
 public:
-    static constexpr type min() noexcept { return type{std::numeric_limits<T>::min()};}
-    static constexpr type lowest() noexcept { return type{std::numeric_limits<T>::lowest()};}
-    static constexpr type max() noexcept { return type{std::numeric_limits<T>::max()};}
-    static constexpr type epsilon() noexcept { return type{std::numeric_limits<T>::epsilon()};}
-    static constexpr type round_error() noexcept { return type{std::numeric_limits<T>::round_error()};}
-    static constexpr type infinity() noexcept { return type{std::numeric_limits<T>::infinity()};}
-    static constexpr type quiet_NaN() noexcept { return type{std::numeric_limits<T>::quiet_NaN()};}
-    static constexpr type signaling_NaN() noexcept { return type{std::numeric_limits<T>::signaling_NaN()};}
-    static constexpr type denorm_min() noexcept { return type{std::numeric_limits<T>::denorm_min()};}
+    STRONG_NODISCARD static constexpr type min() noexcept { return type{std::numeric_limits<T>::min()};}
+    STRONG_NODISCARD static constexpr type lowest() noexcept { return type{std::numeric_limits<T>::lowest()};}
+    STRONG_NODISCARD static constexpr type max() noexcept { return type{std::numeric_limits<T>::max()};}
+    STRONG_NODISCARD static constexpr type epsilon() noexcept { return type{std::numeric_limits<T>::epsilon()};}
+    STRONG_NODISCARD static constexpr type round_error() noexcept { return type{std::numeric_limits<T>::round_error()};}
+    STRONG_NODISCARD static constexpr type infinity() noexcept { return type{std::numeric_limits<T>::infinity()};}
+    STRONG_NODISCARD static constexpr type quiet_NaN() noexcept { return type{std::numeric_limits<T>::quiet_NaN()};}
+    STRONG_NODISCARD static constexpr type signaling_NaN() noexcept { return type{std::numeric_limits<T>::signaling_NaN()};}
+    STRONG_NODISCARD static constexpr type denorm_min() noexcept { return type{std::numeric_limits<T>::denorm_min()};}
 };
 #endif //STRONG_TYPE_ARITHMETIC_HPP
diff --git a/include/strong_type/boolean.hpp b/include/strong_type/boolean.hpp
@@ -30,7 +30,11 @@ struct boolean
     class modifier<T, impl::void_t<decltype(static_cast<bool>(std::declval<const underlying_type_t<T>>()))>>
     {
     public:
-        explicit STRONG_CONSTEXPR operator bool() const
+        STRONG_NODISCARD
+        explicit
+        STRONG_CONSTEXPR
+        operator bool()
+        const
         noexcept(noexcept(static_cast<bool>(value_of(std::declval<const T&>()))))
         {
             const auto& self = static_cast<const T&>(*this);

diff --git a/include/strong_type/difference.hpp b/include/strong_type/difference.hpp
@@ -144,6 +144,7 @@ class difference::modifier<::strong::type<T, Tag, M...>>
         return lh;
     }
 
+    STRONG_NODISCARD
     friend
     STRONG_CONSTEXPR
     type operator+(type lh, const type& rh)
@@ -152,6 +153,7 @@ class difference::modifier<::strong::type<T, Tag, M...>>
         return lh;
     }
 
+    STRONG_NODISCARD
     friend
     STRONG_CONSTEXPR
     type operator-(type lh, const type& rh)
@@ -160,6 +162,7 @@ class difference::modifier<::strong::type<T, Tag, M...>>
         return lh;
     }
 
+    STRONG_NODISCARD
     friend
     STRONG_CONSTEXPR
     type operator*(type lh, const T& rh)
@@ -168,6 +171,7 @@ class difference::modifier<::strong::type<T, Tag, M...>>
         return lh;
     }
 
+    STRONG_NODISCARD
     friend
     STRONG_CONSTEXPR
     type operator*(const T& lh, type rh)
@@ -176,6 +180,7 @@ class difference::modifier<::strong::type<T, Tag, M...>>
         return rh;
     }
 
+    STRONG_NODISCARD
     friend
     STRONG_CONSTEXPR
     type operator/(type lh, const T& rh)
@@ -184,6 +189,7 @@ class difference::modifier<::strong::type<T, Tag, M...>>
         return lh;
     }
 
+    STRONG_NODISCARD
     friend
     STRONG_CONSTEXPR
     T operator/(const type& lh, const type& rh)
@@ -192,6 +198,7 @@ class difference::modifier<::strong::type<T, Tag, M...>>
     }
 
     template <typename TT = T, typename = decltype(std::declval<TT&>() %= std::declval<const TT&>())>
+    STRONG_NODISCARD
     friend
     STRONG_CONSTEXPR
     type operator%(type lh, const T& rh)
@@ -202,6 +209,7 @@ class difference::modifier<::strong::type<T, Tag, M...>>
     }
 
     template <typename TT = T, typename = decltype(std::declval<TT>() % std::declval<TT>())>
+    STRONG_NODISCARD
     friend
     STRONG_CONSTEXPR
     T operator%(type lh, type rh)

diff --git a/include/strong_type/hashable.hpp b/include/strong_type/hashable.hpp
@@ -43,6 +43,7 @@ struct hash<::strong::type<T, Tag, M...>>
 {
     using type = ::strong::type<T, Tag, M...>;
 
+    STRONG_NODISCARD
     decltype(auto)
     operator()(
         const ::strong::hashable::modifier<type> &t)

diff --git a/include/strong_type/range.hpp b/include/strong_type/range.hpp
@@ -44,6 +44,7 @@ class range::modifier<
     using iterator = ::strong::type<r_iterator, Tag, strong::iterator>;
     using const_iterator = ::strong::type<r_const_iterator, Tag, strong::iterator>;
 
+    STRONG_NODISCARD
     constexpr
     iterator
     begin()
@@ -53,6 +54,7 @@ class range::modifier<
         return iterator{value_of(self).begin()};
     }
 
+    STRONG_NODISCARD
     constexpr
     iterator
     end()
@@ -62,6 +64,7 @@ class range::modifier<
         return iterator{value_of(self).end()};
     }
 
+    STRONG_NODISCARD
     constexpr
     const_iterator
     cbegin()
@@ -72,6 +75,7 @@ class range::modifier<
         return const_iterator{value_of(self).begin()};
     }
 
+    STRONG_NODISCARD
     constexpr
     const_iterator
     cend()
@@ -82,6 +86,7 @@ class range::modifier<
         return const_iterator{value_of(self).end()};
     }
 
+    STRONG_NODISCARD
     constexpr
     const_iterator
     begin()
@@ -92,6 +97,7 @@ class range::modifier<
         return const_iterator{value_of(self).begin()};
     }
 
+    STRONG_NODISCARD
     constexpr
     const_iterator
     end()
@@ -103,6 +109,7 @@ class range::modifier<
     }
 
     template <typename TT = const T&>
+    STRONG_NODISCARD
     constexpr
     decltype(std::declval<TT>().size())
     size()

diff --git a/test/test_range.cpp b/test/test_range.cpp
@@ -19,12 +19,14 @@
 #include <array>
 
 namespace {
-    template<typename R, typename = int>
+    template <typename T>
+    constexpr bool ignore(const T&) { return true;}
+    template<typename R, typename = bool>
     struct has_size : std::false_type {
     };
 
     template<typename R>
-    struct has_size<R, decltype(std::declval<const R&>().size(),1)>
+    struct has_size<R, decltype(ignore(std::declval<const R&>().size()))>
     : std::true_type
     {
     };