Fix a conditional expression is constant warning #2210 (#2211)

fmtlib · Apr 7, 2021 · 78776ee · 78776ee
1 parent 266107f
commit 78776ee
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/include/fmt/core.h b/include/fmt/core.h
@@ -393,10 +393,13 @@ template <typename Char> class basic_string_view {
     \endrst
    */
 #if __cplusplus >= 201703L  // C++17's char_traits::length() is constexpr.
-  FMT_CONSTEXPR
+  constexpr
 #endif
-  FMT_INLINE basic_string_view(const Char* s) : data_(s) {
-    if (std::is_same<Char, char>::value && !detail::is_constant_evaluated())
+      FMT_INLINE
+      basic_string_view(const Char* s)
+      : data_(s) {
+    if (detail::const_check(std::is_same<Char, char>::value &&
+                            !detail::is_constant_evaluated()))
       size_ = std::strlen(reinterpret_cast<const char*>(s));
     else
       size_ = std::char_traits<Char>::length(s);