fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 10:47:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Workaround X11 madness (#1388)

Browse Source
This commit is contained in:
Victor Zverovich
2019-11-01 08:37:51 -07:00
parent 6bfc9af8c9
commit 213e09644f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/fmt/format.h
View File

@ -2178,8 +2178,8 @@ template <typename Char> struct arg_ref {
arg_id_kind kind; arg_id_kind kind;
union value { union value {
FMT_CONSTEXPR value() : index(0u) {} FMT_CONSTEXPR value() : index{0u} {}
FMT_CONSTEXPR value(int id) : index(id) {} FMT_CONSTEXPR value(int id) : index{id} {}
FMT_CONSTEXPR value(basic_string_view<Char> n) : name(n) {} FMT_CONSTEXPR value(basic_string_view<Char> n) : name(n) {}
int index; int index;

6
test/format-test.cc
View File

@ -20,8 +20,14 @@
# include <windows.h> # include <windows.h>
#endif #endif
// Check if fmt/format.h compiles with the X11 index macro defined.
#define index(x, y) no nice things
#include "fmt/color.h" #include "fmt/color.h"
#include "fmt/format.h" #include "fmt/format.h"
#undef index
#include "gmock.h" #include "gmock.h"
#include "gtest-extra.h" #include "gtest-extra.h"
#include "mock-allocator.h" #include "mock-allocator.h"