From 1fb1c4c912af0bca6a5959d8b0c471a2c67adec4 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Thu, 13 Sep 2018 07:20:43 -0700 Subject: [PATCH] Update docs --- doc/build.py | 3 ++- include/fmt/format.h | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/build.py b/doc/build.py index 95d28c7e..6d32ac22 100755 --- a/doc/build.py +++ b/doc/build.py @@ -91,7 +91,8 @@ def build_docs(version='dev', **kwargs): FMT_USE_USER_DEFINED_LITERALS=1 \ FMT_API= \ "FMT_BEGIN_NAMESPACE=namespace fmt {{" \ - "FMT_END_NAMESPACE=}}" + "FMT_END_NAMESPACE=}}" \ + "FMT_STRING_ALIAS=1" EXCLUDE_SYMBOLS = fmt::internal::* StringValue write_str '''.format(include_dir, doxyxml_dir).encode('UTF-8')) if p.returncode != 0: diff --git a/include/fmt/format.h b/include/fmt/format.h index 06ea33f2..44a2059a 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -3725,7 +3725,9 @@ FMT_END_NAMESPACE #if defined(FMT_STRING_ALIAS) && FMT_STRING_ALIAS /** \rst - Constructs a compile-time format string. + Constructs a compile-time format string. This macro is disabled by default to + prevent potential name collisions. To enable it define ``FMT_STRING_ALIAS`` to + 1 before including ``fmt/format.h``. **Example**::