Skip to content

F
fmt
Commit 712abe40 authored by Victor Zverovich's avatar Victor Zverovich Committed by Victor Zverovich
Browse files
Options

Workaround a bug in gcc 7.5 (#1912) 

Thanks Martin Janzen.
parent af8a180a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
include/fmt/core.h
View file @ 712abe40
...@@ -910,7 +910,8 @@ template <typename Char> struct named_arg_info { ...@@ -910,7 +910,8 @@ template <typename Char> struct named_arg_info {
template <typename T, typename Char, size_t NUM_ARGS, size_t NUM_NAMED_ARGS> template <typename T, typename Char, size_t NUM_ARGS, size_t NUM_NAMED_ARGS>
struct arg_data { struct arg_data {
// args_[0].named_args points to named_args_ to avoid bloating format_args. // args_[0].named_args points to named_args_ to avoid bloating format_args.
T args_[1 + (NUM_ARGS != 0 ? NUM_ARGS : 1)]; // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning.
T args_[1 + (NUM_ARGS != 0 ? NUM_ARGS : +1)];
named_arg_info<Char> named_args_[NUM_NAMED_ARGS]; named_arg_info<Char> named_args_[NUM_NAMED_ARGS];
template <typename... U> template <typename... U>
...@@ -922,7 +923,8 @@ struct arg_data { ...@@ -922,7 +923,8 @@ struct arg_data {
template <typename T, typename Char, size_t NUM_ARGS> template <typename T, typename Char, size_t NUM_ARGS>
struct arg_data<T, Char, NUM_ARGS, 0> { struct arg_data<T, Char, NUM_ARGS, 0> {
T args_[NUM_ARGS != 0 ? NUM_ARGS : 1]; // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning.
T args_[NUM_ARGS != 0 ? NUM_ARGS : +1];
template <typename... U> template <typename... U>
FMT_INLINE arg_data(const U&... init) : args_{init...} {} FMT_INLINE arg_data(const U&... init) : args_{init...} {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment