gcc constexpr

dalle · Nov 17, 2024 · 928859c · 928859c
1 parent b4d26ef
commit 928859c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/include/fast_float/ascii_number.h b/include/fast_float/ascii_number.h
@@ -292,7 +292,7 @@ parse_number_string(UC const *p, UC const *pend,
   answer.negative = (*p == UC('-')); // assume p < pend, so dereference without checks;
   // C++17 20.19.3.(7.1) explicitly forbids '+' sign here
 #ifdef FASTFLOAT_ALLOWS_LEADING_PLUS // disabled by default
-  if ((*p == UC('-')) || (!(fmt & detail::basic_json_fmt) && *p == UC('+'))) {
+  if ((*p == UC('-')) || (!int(fmt & detail::basic_json_fmt) && *p == UC('+'))) {
 #else
   if ((*p == UC('-')) || (int(fmt & chars_format::allow_leading_plus) &&
        !int(fmt & detail::basic_json_fmt) && *p == UC('+'))) {

diff --git a/include/fast_float/float_common.h b/include/fast_float/float_common.h
@@ -63,17 +63,20 @@ constexpr chars_format operator^(chars_format lhs, chars_format rhs) noexcept {
 
 constexpr chars_format &operator&=(chars_format &lhs,
                                    chars_format rhs) noexcept {
-  return lhs = (lhs & rhs);
+  constexpr chars_format res = lhs & rhs;
+  return lhs = res;
 }
 
 constexpr chars_format &operator|=(chars_format &lhs,
                                    chars_format rhs) noexcept {
-  return lhs = (lhs | rhs);
+  constexpr chars_format res = lhs | rhs;
+  return lhs = res;
 }
 
 constexpr chars_format &operator^=(chars_format &lhs,
                                    chars_format rhs) noexcept {
-  return lhs = (lhs ^ rhs);
+  constexpr chars_format res = lhs ^ rhs;
+  return lhs = res;
 }
 
 template <typename UC> struct from_chars_result_t {