From d53fc62fb0652f34ff2020dfe635bb8a4b4703d1 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Tue, 4 Aug 2020 19:18:44 -0400 Subject: [PATCH] change fmtlib internal namespace from v7 to v7_lmp to avoid clashes when linking with other fmtlib variants --- src/fmt/core.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fmt/core.h b/src/fmt/core.h index 40c4ddb077..f9155000ec 100644 --- a/src/fmt/core.h +++ b/src/fmt/core.h @@ -188,12 +188,12 @@ # define FMT_INLINE_NAMESPACE namespace # define FMT_END_NAMESPACE \ } \ - using namespace v7; \ + using namespace v7_lmp; \ } # endif # define FMT_BEGIN_NAMESPACE \ namespace fmt { \ - FMT_INLINE_NAMESPACE v7 { + FMT_INLINE_NAMESPACE v7_lmp { #endif #if !defined(FMT_HEADER_ONLY) && defined(_WIN32) @@ -491,7 +491,7 @@ constexpr basic_string_view to_string_view(const S& s) { namespace detail { void to_string_view(...); -using fmt::v7::to_string_view; +using fmt::v7_lmp::to_string_view; // Specifies whether S is a string type convertible to fmt::basic_string_view. // It should be a constexpr function but MSVC 2017 fails to compile it in