mirror of
https://github.com/fmtlib/fmt.git
synced 2026-08-03 20:14:20 +02:00
avoid MSC warning C4702: unreachable code (#4822)
if FMT_CONSTEXPR is resolved to constexpr MSC warns about dead code after 'return' instruction. Explicitly using 'else' in these cases avoids the warning.
This commit is contained in:
+23
-13
@@ -1285,9 +1285,12 @@ constexpr auto to_ascii(Char c) -> char {
|
|||||||
// Returns the number of code units in a code point or 1 on error.
|
// Returns the number of code units in a code point or 1 on error.
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
FMT_CONSTEXPR auto code_point_length(const Char* begin) -> int {
|
FMT_CONSTEXPR auto code_point_length(const Char* begin) -> int {
|
||||||
if FMT_CONSTEXPR20 (sizeof(Char) != 1) return 1;
|
if FMT_CONSTEXPR20 (sizeof(Char) != 1) {
|
||||||
auto c = static_cast<unsigned char>(*begin);
|
return 1;
|
||||||
return static_cast<int>((0x3a55000000000000ull >> (2 * (c >> 3))) & 3) + 1;
|
} else {
|
||||||
|
auto c = static_cast<unsigned char>(*begin);
|
||||||
|
return static_cast<int>((0x3a55000000000000ull >> (2 * (c >> 3))) & 3) + 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parses the range [begin, end) as an unsigned integer. This function assumes
|
// Parses the range [begin, end) as an unsigned integer. This function assumes
|
||||||
@@ -2896,10 +2899,12 @@ FMT_API void vprint_buffered(FILE* f, string_view fmt, format_args args);
|
|||||||
template <typename... T>
|
template <typename... T>
|
||||||
FMT_INLINE void print(format_string<T...> fmt, T&&... args) {
|
FMT_INLINE void print(format_string<T...> fmt, T&&... args) {
|
||||||
vargs<T...> va = {{args...}};
|
vargs<T...> va = {{args...}};
|
||||||
if FMT_CONSTEXPR20 (!detail::use_utf8)
|
if FMT_CONSTEXPR20 (!detail::use_utf8) {
|
||||||
return detail::vprint_mojibake(stdout, fmt.str, va, false);
|
detail::vprint_mojibake(stdout, fmt.str, va, false);
|
||||||
detail::is_locking<T...>() ? vprint_buffered(stdout, fmt.str, va)
|
} else {
|
||||||
: vprint(fmt.str, va);
|
detail::is_locking<T...>() ? vprint_buffered(stdout, fmt.str, va)
|
||||||
|
: vprint(fmt.str, va);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -2913,10 +2918,12 @@ FMT_INLINE void print(format_string<T...> fmt, T&&... args) {
|
|||||||
template <typename... T>
|
template <typename... T>
|
||||||
FMT_INLINE void print(FILE* f, format_string<T...> fmt, T&&... args) {
|
FMT_INLINE void print(FILE* f, format_string<T...> fmt, T&&... args) {
|
||||||
vargs<T...> va = {{args...}};
|
vargs<T...> va = {{args...}};
|
||||||
if FMT_CONSTEXPR20 (!detail::use_utf8)
|
if FMT_CONSTEXPR20 (!detail::use_utf8) {
|
||||||
return detail::vprint_mojibake(f, fmt.str, va, false);
|
detail::vprint_mojibake(f, fmt.str, va, false);
|
||||||
detail::is_locking<T...>() ? vprint_buffered(f, fmt.str, va)
|
} else {
|
||||||
: vprint(f, fmt.str, va);
|
detail::is_locking<T...>() ? vprint_buffered(f, fmt.str, va)
|
||||||
|
: vprint(f, fmt.str, va);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Formats `args` according to specifications in `fmt` and writes the output
|
/// Formats `args` according to specifications in `fmt` and writes the output
|
||||||
@@ -2924,8 +2931,11 @@ FMT_INLINE void print(FILE* f, format_string<T...> fmt, T&&... args) {
|
|||||||
template <typename... T>
|
template <typename... T>
|
||||||
FMT_INLINE void println(FILE* f, format_string<T...> fmt, T&&... args) {
|
FMT_INLINE void println(FILE* f, format_string<T...> fmt, T&&... args) {
|
||||||
vargs<T...> va = {{args...}};
|
vargs<T...> va = {{args...}};
|
||||||
if FMT_CONSTEXPR20 (detail::use_utf8) return vprintln(f, fmt.str, va);
|
if FMT_CONSTEXPR20 (detail::use_utf8) {
|
||||||
detail::vprint_mojibake(f, fmt.str, va, true);
|
vprintln(f, fmt.str, va);
|
||||||
|
} else {
|
||||||
|
detail::vprint_mojibake(f, fmt.str, va, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Formats `args` according to specifications in `fmt` and writes the output
|
/// Formats `args` according to specifications in `fmt` and writes the output
|
||||||
|
|||||||
Reference in New Issue
Block a user