mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-04 17:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[msvc] fix warning about non-inline variable

Browse Source
This commit is contained in:
Russell Greene 2023-02-07 16:12:58 -06:00 committed by Victor Zverovich
parent 3c5464ba1c
commit 6e6eb63770
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/core.h
View File

@ -281,6 +281,12 @@
# endif
#endif
#if defined __cpp_inline_variables && __cpp_inline_variables >= 201606L
# define FMT_INLINE_VARIABLE inline
#else
# define FMT_INLINE_VARIABLE
#endif
// Enable minimal optimizations for more compact code in debug mode.
FMT_GCC_PRAGMA("GCC push_options")
#if !defined(__OPTIMIZE__) && !defined(__NVCOMPILER) && !defined(__LCC__)
@ -2662,7 +2668,7 @@ FMT_CONSTEXPR auto check_char_specs(const format_specs<Char>& specs) -> bool {
return true;
}
constexpr int invalid_arg_index = -1;
constexpr FMT_INLINE_VARIABLE int invalid_arg_index = -1;
#if FMT_USE_NONTYPE_TEMPLATE_ARGS
template <int N, typename T, typename... Args, typename Char>

2
include/fmt/format.h
View File

@ -680,7 +680,7 @@ FMT_CONSTEXPR inline auto utf8_decode(const char* s, uint32_t* c, int* e)
return next;
}
constexpr uint32_t invalid_code_point = ~uint32_t();
constexpr FMT_INLINE_VARIABLE uint32_t invalid_code_point = ~uint32_t();
// Invokes f(cp, sv) for every code point cp in s with sv being the string view
// corresponding to the code point. cp is invalid_code_point on error.