Remove new macro, update example with correct way to specify fmt lib namespace when fmt_lib namespace alias cannot be used.

This commit is contained in:
Kevin Slattery
2022-05-12 18:55:08 -05:00
parent 5f5e70e96e
commit d3dee23e6c
2 changed files with 9 additions and 18 deletions

View File

@@ -126,13 +126,6 @@ using sink_ptr = std::shared_ptr<sinks::sink>;
using sinks_init_list = std::initializer_list<sink_ptr>;
using err_handler = std::function<void(const std::string &err_msg)>;
#ifdef SPDLOG_USE_STD_FORMAT
# ifndef FMTLIB_BEGIN_NAMESPACE
# define FMTLIB_BEGIN_NAMESPACE \
namespace std {
# define FMTLIB_END_NAMESPACE \
}
# endif
namespace fmt_lib = std;
using string_view_t = std::string_view;
@@ -153,16 +146,7 @@ template<typename... Args>
using wformat_string_t = std::wstring_view;
# endif
# define SPDLOG_BUF_TO_STRING(x) x
#else // use fmt lib instead of std::format
# ifndef FMTLIB_BEGIN_NAMESPACE
# define FMTLIB_BEGIN_NAMESPACE \
namespace fmt {
# define FMTLIB_END_NAMESPACE \
}
# endif
namespace fmt_lib = fmt;
using string_view_t = fmt::basic_string_view<char>;