couchbase 3.0.0-universal-darwin-19 → 3.0.1-universal-darwin-19

data/ext/third_party/spdlog/include/spdlog/pattern_formatter.h

@@ -22,7 +22,7 @@ namespace details {
 // padding information.
 struct padding_info
 {
-    enum pad_side
+    enum class pad_side
     {
         left,
         right,
@@ -42,7 +42,7 @@ struct padding_info
         return enabled_;
     }
     size_t width_ = 0;
-    pad_side side_ = left;
+    pad_side side_ = pad_side::left;
     bool truncate_ = false;
     bool enabled_ = false;
 };
@@ -92,7 +92,7 @@ public:
     void format(const details::log_msg &msg, memory_buf_t &dest) override;
 
     template<typename T, typename... Args>
-    pattern_formatter &add_flag(char flag, const Args &... args)
+    pattern_formatter &add_flag(char flag, const Args &...args)
     {
         custom_handlers_[flag] = details::make_unique<T>(args...);
         return *this;

data/ext/third_party/spdlog/include/spdlog/sinks/daily_file_sink.h

@@ -155,7 +155,7 @@ private:
         using details::os::filename_to_str;
         using details::os::remove_if_exists;
 
-        filename_t current_file = filename();
+        filename_t current_file = file_helper_.filename();
         if (filenames_q_.full())
         {
             auto old_filename = std::move(filenames_q_.front());

data/ext/third_party/spdlog/include/spdlog/sinks/msvc_sink.h

@@ -8,12 +8,13 @@
 #include <spdlog/details/null_mutex.h>
 #include <spdlog/sinks/base_sink.h>
 
-#include <spdlog/details/windows_include.h>
-#include <winbase.h>
-
 #include <mutex>
 #include <string>
 
+
+// Avoid including windows.h (https://stackoverflow.com/a/30741042)
+extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char *lpOutputString);
+
 namespace spdlog {
 namespace sinks {
 /*
@@ -23,12 +24,11 @@ template<typename Mutex>
 class msvc_sink : public base_sink<Mutex>
 {
 public:
-    explicit msvc_sink() {}
+    msvc_sink() = default;
 
 protected:
     void sink_it_(const details::log_msg &msg) override
     {
-
         memory_buf_t formatted;
         base_sink<Mutex>::formatter_->format(msg, formatted);
         OutputDebugStringA(fmt::to_string(formatted).c_str());

data/ext/third_party/spdlog/include/spdlog/sinks/ringbuffer_sink.h

@@ -28,10 +28,11 @@ public:
     std::vector<details::log_msg_buffer> last_raw(size_t lim = 0)
     {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
-        auto n_items = lim > 0 ? (std::min)(lim, q_.size()) : q_.size();
+        auto items_available = q_.size();
+        auto n_items = lim > 0 ? (std::min)(lim, items_available) : items_available;
         std::vector<details::log_msg_buffer> ret;
         ret.reserve(n_items);
-        for (size_t i = 0; i < n_items; i++)
+        for (size_t i = (items_available - n_items); i < items_available; i++)
         {
             ret.push_back(q_.at(i));
         }
@@ -41,10 +42,11 @@ public:
     std::vector<std::string> last_formatted(size_t lim = 0)
     {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
-        auto n_items = lim > 0 ? (std::min)(lim, q_.size()) : q_.size();
+        auto items_available = q_.size();
+        auto n_items = lim > 0 ? (std::min)(lim, items_available) : items_available;
         std::vector<std::string> ret;
         ret.reserve(n_items);
-        for (size_t i = 0; i < n_items; i++)
+        for (size_t i = (items_available - n_items); i < items_available; i++)
         {
             memory_buf_t formatted;
             base_sink<Mutex>::formatter_->format(q_.at(i), formatted);

data/ext/third_party/spdlog/include/spdlog/sinks/stdout_sinks-inl.h

@@ -11,6 +11,15 @@
 #include <spdlog/pattern_formatter.h>
 #include <memory>
 
+#ifdef _WIN32
+// under windows using fwrite to non-binary stream results in \r\r\n (see issue #1675)
+// so instead we use ::FileWrite
+#include <spdlog/details/windows_include.h>
+#include <fileapi.h> // WriteFile (..)
+#include <io.h>      // _get_osfhandle(..)
+#include <stdio.h>   // _fileno(..)
+#endif               // WIN32
+
 namespace spdlog {
 
 namespace sinks {
@@ -20,7 +29,16 @@ SPDLOG_INLINE stdout_sink_base<ConsoleMutex>::stdout_sink_base(FILE *file)
     : mutex_(ConsoleMutex::mutex())
     , file_(file)
     , formatter_(details::make_unique<spdlog::pattern_formatter>())
-{}
+{
+#ifdef _WIN32
+    // get windows handle from the FILE* object
+    handle_ = (HANDLE)::_get_osfhandle(::_fileno(file_));
+    if (handle_ == INVALID_HANDLE_VALUE)
+    {
+        throw_spdlog_ex("spdlog::stdout_sink_base: _get_osfhandle() failed", errno);
+    }
+#endif // WIN32
+}
 
 template<typename ConsoleMutex>
 SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::log(const details::log_msg &msg)
@@ -28,8 +46,19 @@ SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::log(const details::log_msg &m
     std::lock_guard<mutex_t> lock(mutex_);
     memory_buf_t formatted;
     formatter_->format(msg, formatted);
-    fwrite(formatted.data(), sizeof(char), formatted.size(), file_);
-    fflush(file_); // flush every line to terminal
+#ifdef _WIN32
+    ::fflush(file_); // flush in case there is somthing in this file_ already
+    auto size = static_cast<DWORD>(formatted.size());
+    DWORD bytes_written = 0;
+    bool ok = ::WriteFile(handle_, formatted.data(), size, &bytes_written, nullptr) != 0;
+    if (!ok)
+    {
+        throw_spdlog_ex("stdout_sink_base: WriteFile() failed. GetLastError(): " + std::to_string(::GetLastError()));
+    }
+#else
+    ::fwrite(formatted.data(), sizeof(char), formatted.size(), file_);
+    ::fflush(file_); // flush every line to terminal
+#endif // WIN32    
 }
 
 template<typename ConsoleMutex>

data/ext/third_party/spdlog/include/spdlog/sinks/stdout_sinks.h

@@ -8,6 +8,10 @@
 #include <spdlog/sinks/sink.h>
 #include <cstdio>
 
+#ifdef _WIN32
+#include <spdlog/details/windows_include.h>
+#endif
+
 namespace spdlog {
 
 namespace sinks {
@@ -36,6 +40,9 @@ protected:
     mutex_t &mutex_;
     FILE *file_;
     std::unique_ptr<spdlog::formatter> formatter_;
+#ifdef _WIN32
+    HANDLE handle_;    
+#endif // WIN32
 };
 
 template<typename ConsoleMutex>

data/ext/third_party/spdlog/include/spdlog/sinks/wincolor_sink-inl.h

@@ -146,22 +146,12 @@ void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::write_to_file_(const memory_buf_
         return;
     }
     auto size = static_cast<DWORD>(formatted.size());
-    if (size == 0)
+    DWORD bytes_written = 0;
+    bool ok = ::WriteFile(out_handle_, formatted.data(), size, &bytes_written, nullptr) != 0;
+    if (!ok)
     {
-        return;
+        throw_spdlog_ex("wincolor_sink: ::WriteFile() failed. GetLastError(): " + std::to_string(::GetLastError()));
     }
-
-    DWORD total_written = 0;
-    do
-    {
-        DWORD bytes_written = 0;
-        bool ok = ::WriteFile(out_handle_, formatted.data() + total_written, size - total_written, &bytes_written, nullptr) != 0;
-        if (!ok || bytes_written == 0)
-        {
-            throw_spdlog_ex("wincolor_sink: write_to_file_ failed. GetLastError(): " + std::to_string(::GetLastError()));
-        }
-        total_written += bytes_written;
-    } while (total_written < size);
 }
 
 // wincolor_stdout_sink

data/ext/third_party/spdlog/include/spdlog/spdlog-inl.h

@@ -47,6 +47,16 @@ SPDLOG_INLINE void dump_backtrace()
     default_logger_raw()->dump_backtrace();
 }
 
+SPDLOG_INLINE level::level_enum get_level()
+{
+    return default_logger_raw()->level();
+}
+
+SPDLOG_INLINE bool should_log(level::level_enum log_level)
+{
+    return default_logger_raw()->should_log(log_level);
+}
+
 SPDLOG_INLINE void set_level(level::level_enum log_level)
 {
     details::registry::instance().set_level(log_level);
@@ -112,4 +122,4 @@ SPDLOG_INLINE void set_default_logger(std::shared_ptr<spdlog::logger> default_lo
     details::registry::instance().set_default_logger(std::move(default_logger));
 }
 
-} // namespace spdlog
+} // namespace spdlog

data/ext/third_party/spdlog/include/spdlog/spdlog.h

@@ -31,7 +31,7 @@ using default_factory = synchronous_factory;
 // Example:
 //   spdlog::create<daily_file_sink_st>("logger_name", "dailylog_filename", 11, 59);
 template<typename Sink, typename... SinkArgs>
-inline std::shared_ptr<spdlog::logger> create(std::string logger_name, SinkArgs &&... sink_args)
+inline std::shared_ptr<spdlog::logger> create(std::string logger_name, SinkArgs &&...sink_args)
 {
     return default_factory::create<Sink>(std::move(logger_name), std::forward<SinkArgs>(sink_args)...);
 }
@@ -67,9 +67,15 @@ SPDLOG_API void disable_backtrace();
 // call dump backtrace on default logger
 SPDLOG_API void dump_backtrace();
 
+// Get global logging level
+SPDLOG_API level::level_enum get_level();
+
 // Set global logging level
 SPDLOG_API void set_level(level::level_enum log_level);
 
+// Determine whether the default logger should log messages with a certain level
+SPDLOG_API bool should_log(level::level_enum lvl);
+
 // Set global flush level
 SPDLOG_API void flush_on(level::level_enum log_level);
 
@@ -121,50 +127,50 @@ SPDLOG_API spdlog::logger *default_logger_raw();
 
 SPDLOG_API void set_default_logger(std::shared_ptr<spdlog::logger> default_logger);
 
-template<typename... Args>
-inline void log(source_loc source, level::level_enum lvl, string_view_t fmt, const Args &... args)
+template<typename FormatString, typename... Args>
+inline void log(source_loc source, level::level_enum lvl, const FormatString &fmt, const Args &...args)
 {
     default_logger_raw()->log(source, lvl, fmt, args...);
 }
 
-template<typename... Args>
-inline void log(level::level_enum lvl, string_view_t fmt, const Args &... args)
+template<typename FormatString, typename... Args>
+inline void log(level::level_enum lvl, const FormatString &fmt, const Args &...args)
 {
     default_logger_raw()->log(source_loc{}, lvl, fmt, args...);
 }
 
-template<typename... Args>
-inline void trace(string_view_t fmt, const Args &... args)
+template<typename FormatString, typename... Args>
+inline void trace(const FormatString &fmt, const Args &...args)
 {
     default_logger_raw()->trace(fmt, args...);
 }
 
-template<typename... Args>
-inline void debug(string_view_t fmt, const Args &... args)
+template<typename FormatString, typename... Args>
+inline void debug(const FormatString &fmt, const Args &...args)
 {
     default_logger_raw()->debug(fmt, args...);
 }
 
-template<typename... Args>
-inline void info(string_view_t fmt, const Args &... args)
+template<typename FormatString, typename... Args>
+inline void info(const FormatString &fmt, const Args &...args)
 {
     default_logger_raw()->info(fmt, args...);
 }
 
-template<typename... Args>
-inline void warn(string_view_t fmt, const Args &... args)
+template<typename FormatString, typename... Args>
+inline void warn(const FormatString &fmt, const Args &...args)
 {
     default_logger_raw()->warn(fmt, args...);
 }
 
-template<typename... Args>
-inline void error(string_view_t fmt, const Args &... args)
+template<typename FormatString, typename... Args>
+inline void error(const FormatString &fmt, const Args &...args)
 {
     default_logger_raw()->error(fmt, args...);
 }
 
-template<typename... Args>
-inline void critical(string_view_t fmt, const Args &... args)
+template<typename FormatString, typename... Args>
+inline void critical(const FormatString &fmt, const Args &...args)
 {
     default_logger_raw()->critical(fmt, args...);
 }
@@ -217,57 +223,6 @@ inline void critical(const T &msg)
     default_logger_raw()->critical(msg);
 }
 
-#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-template<typename... Args>
-inline void log(source_loc source, level::level_enum lvl, wstring_view_t fmt, const Args &... args)
-{
-    default_logger_raw()->log(source, lvl, fmt, args...);
-}
-
-template<typename... Args>
-inline void log(level::level_enum lvl, wstring_view_t fmt, const Args &... args)
-{
-    default_logger_raw()->log(lvl, fmt, args...);
-}
-
-template<typename... Args>
-inline void trace(wstring_view_t fmt, const Args &... args)
-{
-    default_logger_raw()->trace(fmt, args...);
-}
-
-template<typename... Args>
-inline void debug(wstring_view_t fmt, const Args &... args)
-{
-    default_logger_raw()->debug(fmt, args...);
-}
-
-template<typename... Args>
-inline void info(wstring_view_t fmt, const Args &... args)
-{
-    default_logger_raw()->info(fmt, args...);
-}
-
-template<typename... Args>
-inline void warn(wstring_view_t fmt, const Args &... args)
-{
-    default_logger_raw()->warn(fmt, args...);
-}
-
-template<typename... Args>
-inline void error(wstring_view_t fmt, const Args &... args)
-{
-    default_logger_raw()->error(fmt, args...);
-}
-
-template<typename... Args>
-inline void critical(wstring_view_t fmt, const Args &... args)
-{
-    default_logger_raw()->critical(fmt, args...);
-}
-
-#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT
-
 } // namespace spdlog
 
 //

data/ext/third_party/spdlog/include/spdlog/stopwatch.h

@@ -0,0 +1,61 @@
+// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+
+#pragma once
+
+#include <spdlog/fmt/fmt.h>
+
+// Stopwatch support for spdlog  (using std::chrono::steady_clock).
+// Displays elapsed seconds since construction as double.
+//
+// Usage:
+//
+// spdlog::stopwatch sw;
+// ...
+// spdlog::debug("Elapsed: {} seconds", sw);    =>  "Elapsed 0.005116733 seconds"
+// spdlog::info("Elapsed: {:.6} seconds", sw);  =>  "Elapsed 0.005163 seconds"
+//
+//
+// If other units are needed (e.g. millis instead of double), include "fmt/chrono.h" and use "duration_cast<..>(sw.elapsed())":
+//
+// #include <spdlog/fmt/chrono.h>
+//..
+// using std::chrono::duration_cast;
+// using std::chrono::milliseconds;
+// spdlog::info("Elapsed {}", duration_cast<milliseconds>(sw.elapsed())); => "Elapsed 5ms"
+
+namespace spdlog {
+class stopwatch
+{
+    using clock = std::chrono::steady_clock;
+    std::chrono::time_point<clock> start_tp_;
+
+public:
+    stopwatch()
+        : start_tp_{clock::now()}
+    {}
+
+    std::chrono::duration<double> elapsed() const
+    {
+        return std::chrono::duration<double>(clock::now() - start_tp_);
+    }
+
+    void reset()
+    {
+        start_tp_ = clock ::now();
+    }
+};
+} // namespace spdlog
+
+// Support for fmt formatting  (e.g. "{:012.9}" or just "{}")
+namespace fmt {
+template<>
+struct formatter<spdlog::stopwatch> : formatter<double>
+{
+    template<typename FormatContext>
+    auto format(const spdlog::stopwatch &sw, FormatContext &ctx) -> decltype(ctx.out())
+    {
+        return formatter<double>::format(sw.elapsed().count(), ctx);
+    }
+};
+} // namespace fmt

data/ext/third_party/spdlog/include/spdlog/version.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #define SPDLOG_VER_MAJOR 1
-#define SPDLOG_VER_MINOR 6
-#define SPDLOG_VER_PATCH 0
+#define SPDLOG_VER_MINOR 8
+#define SPDLOG_VER_PATCH 1
 
 #define SPDLOG_VERSION (SPDLOG_VER_MAJOR * 10000 + SPDLOG_VER_MINOR * 100 + SPDLOG_VER_PATCH)

data/ext/third_party/spdlog/src/fmt.cpp

@@ -10,12 +10,12 @@
 #include <spdlog/fmt/bundled/format-inl.h>
 
 FMT_BEGIN_NAMESPACE
-namespace internal {
+namespace detail {
 
 template<typename T>
 int format_float(char *buf, std::size_t size, const char *format, int precision, T value)
 {
-#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+#ifdef FMT_FUZZ
     if (precision > 100000)
         throw std::runtime_error("fuzz mode - avoid large allocation inside snprintf");
 #endif
@@ -23,167 +23,41 @@ int format_float(char *buf, std::size_t size, const char *format, int precision,
     int (*snprintf_ptr)(char *, size_t, const char *, ...) = FMT_SNPRINTF;
     return precision < 0 ? snprintf_ptr(buf, size, format, value) : snprintf_ptr(buf, size, format, precision, value);
 }
-struct sprintf_specs
-{
-    int precision;
-    char type;
-    bool alt : 1;
-
-    template<typename Char>
-    constexpr sprintf_specs(basic_format_specs<Char> specs)
-        : precision(specs.precision)
-        , type(specs.type)
-        , alt(specs.alt)
-    {}
-
-    constexpr bool has_precision() const
-    {
-        return precision >= 0;
-    }
-};
-
-// This is deprecated and is kept only to preserve ABI compatibility.
-template<typename Double>
-char *sprintf_format(Double value, internal::buffer<char> &buf, sprintf_specs specs)
-{
-    // Buffer capacity must be non-zero, otherwise MSVC's vsnprintf_s will fail.
-    FMT_ASSERT(buf.capacity() != 0, "empty buffer");
-
-    // Build format string.
-    enum
-    {
-        max_format_size = 10
-    }; // longest format: %#-*.*Lg
-    char format[max_format_size];
-    char *format_ptr = format;
-    *format_ptr++ = '%';
-    if (specs.alt || !specs.type)
-        *format_ptr++ = '#';
-    if (specs.precision >= 0)
-    {
-        *format_ptr++ = '.';
-        *format_ptr++ = '*';
-    }
-    if (std::is_same<Double, long double>::value)
-        *format_ptr++ = 'L';
-
-    char type = specs.type;
-
-    if (type == '%')
-        type = 'f';
-    else if (type == 0 || type == 'n')
-        type = 'g';
-#if FMT_MSC_VER
-    if (type == 'F')
-    {
-        // MSVC's printf doesn't support 'F'.
-        type = 'f';
-    }
-#endif
-    *format_ptr++ = type;
-    *format_ptr = '\0';
-
-    // Format using snprintf.
-    char *start = nullptr;
-    char *decimal_point_pos = nullptr;
-    for (;;)
-    {
-        std::size_t buffer_size = buf.capacity();
-        start = &buf[0];
-        int result = format_float(start, buffer_size, format, specs.precision, value);
-        if (result >= 0)
-        {
-            unsigned n = internal::to_unsigned(result);
-            if (n < buf.capacity())
-            {
-                // Find the decimal point.
-                auto p = buf.data(), end = p + n;
-                if (*p == '+' || *p == '-')
-                    ++p;
-                if (specs.type != 'a' && specs.type != 'A')
-                {
-                    while (p < end && *p >= '0' && *p <= '9')
-                        ++p;
-                    if (p < end && *p != 'e' && *p != 'E')
-                    {
-                        decimal_point_pos = p;
-                        if (!specs.type)
-                        {
-                            // Keep only one trailing zero after the decimal point.
-                            ++p;
-                            if (*p == '0')
-                                ++p;
-                            while (p != end && *p >= '1' && *p <= '9')
-                                ++p;
-                            char *where = p;
-                            while (p != end && *p == '0')
-                                ++p;
-                            if (p == end || *p < '0' || *p > '9')
-                            {
-                                if (p != end)
-                                    std::memmove(where, p, to_unsigned(end - p));
-                                n -= static_cast<unsigned>(p - where);
-                            }
-                        }
-                    }
-                }
-                buf.resize(n);
-                break; // The buffer is large enough - continue with formatting.
-            }
-            buf.reserve(n + 1);
-        }
-        else
-        {
-            // If result is negative we ask to increase the capacity by at least 1,
-            // but as std::vector, the buffer grows exponentially.
-            buf.reserve(buf.capacity() + 1);
-        }
-    }
-    return decimal_point_pos;
-}
-} // namespace internal
+} // namespace detail
 
-template FMT_API char *internal::sprintf_format(double, internal::buffer<char> &, sprintf_specs);
-template FMT_API char *internal::sprintf_format(long double, internal::buffer<char> &, sprintf_specs);
-
-template struct FMT_INSTANTIATION_DEF_API internal::basic_data<void>;
+template struct FMT_INSTANTIATION_DEF_API detail::basic_data<void>;
 
 // Workaround a bug in MSVC2013 that prevents instantiation of format_float.
-int (*instantiate_format_float)(double, int, internal::float_specs, internal::buffer<char> &) = internal::format_float;
+int (*instantiate_format_float)(double, int, detail::float_specs, detail::buffer<char> &) = detail::format_float;
 
 #ifndef FMT_STATIC_THOUSANDS_SEPARATOR
-template FMT_API internal::locale_ref::locale_ref(const std::locale &loc);
-template FMT_API std::locale internal::locale_ref::get<std::locale>() const;
+template FMT_API detail::locale_ref::locale_ref(const std::locale &loc);
+template FMT_API std::locale detail::locale_ref::get<std::locale>() const;
 #endif
 
 // Explicit instantiations for char.
 
-template FMT_API std::string internal::grouping_impl<char>(locale_ref);
-template FMT_API char internal::thousands_sep_impl(locale_ref);
-template FMT_API char internal::decimal_point_impl(locale_ref);
-
-template FMT_API void internal::buffer<char>::append(const char *, const char *);
+template FMT_API std::string detail::grouping_impl<char>(locale_ref);
+template FMT_API char detail::thousands_sep_impl(locale_ref);
+template FMT_API char detail::decimal_point_impl(locale_ref);
 
-template FMT_API void internal::arg_map<format_context>::init(const basic_format_args<format_context> &args);
+template FMT_API void detail::buffer<char>::append(const char *, const char *);
 
-template FMT_API std::string internal::vformat<char>(string_view, basic_format_args<format_context>);
+template FMT_API FMT_BUFFER_CONTEXT(char)::iterator detail::vformat_to(
+    detail::buffer<char> &, string_view, basic_format_args<FMT_BUFFER_CONTEXT(char)>);
 
-template FMT_API format_context::iterator internal::vformat_to(internal::buffer<char> &, string_view, basic_format_args<format_context>);
-
-template FMT_API int internal::snprintf_float(double, int, internal::float_specs, internal::buffer<char> &);
-template FMT_API int internal::snprintf_float(long double, int, internal::float_specs, internal::buffer<char> &);
-template FMT_API int internal::format_float(double, int, internal::float_specs, internal::buffer<char> &);
-template FMT_API int internal::format_float(long double, int, internal::float_specs, internal::buffer<char> &);
+template FMT_API int detail::snprintf_float(double, int, detail::float_specs, detail::buffer<char> &);
+template FMT_API int detail::snprintf_float(long double, int, detail::float_specs, detail::buffer<char> &);
+template FMT_API int detail::format_float(double, int, detail::float_specs, detail::buffer<char> &);
+template FMT_API int detail::format_float(long double, int, detail::float_specs, detail::buffer<char> &);
 
 // Explicit instantiations for wchar_t.
 
-template FMT_API std::string internal::grouping_impl<wchar_t>(locale_ref);
-template FMT_API wchar_t internal::thousands_sep_impl(locale_ref);
-template FMT_API wchar_t internal::decimal_point_impl(locale_ref);
-
-template FMT_API void internal::buffer<wchar_t>::append(const wchar_t *, const wchar_t *);
+template FMT_API std::string detail::grouping_impl<wchar_t>(locale_ref);
+template FMT_API wchar_t detail::thousands_sep_impl(locale_ref);
+template FMT_API wchar_t detail::decimal_point_impl(locale_ref);
 
-template FMT_API std::wstring internal::vformat<wchar_t>(wstring_view, basic_format_args<wformat_context>);
+template FMT_API void detail::buffer<wchar_t>::append(const wchar_t *, const wchar_t *);
 FMT_END_NAMESPACE
 
 #endif // !SPDLOG_FMT_EXTERNAL