From a0f0493e2a7090ff61009c80f8b5078883d02e1d Mon Sep 17 00:00:00 2001 From: greg7mdp Date: Tue, 21 Jun 2022 08:08:13 -0400 Subject: [PATCH] rename macro which can conflict with msvc headers --- examples/bench.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/bench.cc b/examples/bench.cc index 93c7556..5fbdac3 100644 --- a/examples/bench.cc +++ b/examples/bench.cc @@ -74,8 +74,8 @@ #endif #endif -#define xstr(s) str(s) -#define str(s) #s +#define phmap_xstr(s) phmap_str(s) +#define phmap_str(s) #s template using HashT = MAPNAME; @@ -83,7 +83,7 @@ using HashT = MAPNAME; using hash_t = HashT; using str_hash_t = HashT; -const char *program_slug = xstr(MAPNAME); // "_4"; +const char *program_slug = phmap_xstr(MAPNAME); // "_4"; #include #include @@ -408,7 +408,7 @@ int main(int argc, char ** argv) #if MT_SUPPORT if (!strcmp(program_slug,"absl::parallel_flat_hash_map") || !strcmp(program_slug,"phmap::parallel_flat_hash_map")) - program_slug = xstr(MAPNAME) "_mt"; + program_slug = phmap_xstr(MAPNAME) "_mt"; #endif std::thread t1(memlog);