npm - couchbase - Versions diffs - 4.4.4 → 4.4.5 - Mend

couchbase 4.4.4 → 4.4.5

Files changed (313) hide show

package/deps/couchbase-cxx-cache/spdlog/{19df5d3d8e5526c255d27414e09568671ef87483 → 7251ead404dccd824789f8f3a13df2a6fb56440c}/spdlog/include/spdlog/sinks/wincolor_sink-inl.h RENAMED Viewed

@@ -134,9 +134,18 @@ void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::print_range_(const memory_buf_t
                                                              size_t start,
                                                              size_t end) {
     if (end > start) {
+#if defined(SPDLOG_UTF8_TO_WCHAR_CONSOLE)
+        wmemory_buf_t wformatted;
+        details::os::utf8_to_wstrbuf(string_view_t(formatted.data() + start, end - start),
+            wformatted);
+        auto size = static_cast<DWORD>(wformatted.size());
+        auto ignored = ::WriteConsoleW(static_cast<HANDLE>(out_handle_), wformatted.data(), size,
+            nullptr, nullptr);
+#else
         auto size = static_cast<DWORD>(end - start);
         auto ignored = ::WriteConsoleA(static_cast<HANDLE>(out_handle_), formatted.data() + start,
                                        size, nullptr, nullptr);
+#endif
         (void)(ignored);
     }
 }

package/deps/couchbase-cxx-cache/spdlog/{19df5d3d8e5526c255d27414e09568671ef87483 → 7251ead404dccd824789f8f3a13df2a6fb56440c}/spdlog/include/spdlog/version.h RENAMED Viewed

@@ -4,8 +4,8 @@
 #pragma once
 #define SPDLOG_VER_MAJOR 1
-#define SPDLOG_VER_MINOR 14
-#define SPDLOG_VER_PATCH 1
+#define SPDLOG_VER_MINOR 15
+#define SPDLOG_VER_PATCH 0
 #define SPDLOG_TO_VERSION(major, minor, patch) (major * 10000 + minor * 100 + patch)
 #define SPDLOG_VERSION SPDLOG_TO_VERSION(SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR, SPDLOG_VER_PATCH)

package/deps/couchbase-cxx-cache/{fmt/141a17a028e6c29914e109691389f6cf87f9cfe3/fmt/src/format.cc → spdlog/7251ead404dccd824789f8f3a13df2a6fb56440c/spdlog/src/bundled_fmtlib_format.cpp} RENAMED Viewed

@@ -1,11 +1,14 @@
-// Formatting library for C++
-//
+// Slightly modified version of fmt lib's format.cc source file.
 // Copyright (c) 2012 - 2016, Victor Zverovich
 // All rights reserved.
-//
-// For the license information refer to format.h.
-#include "fmt/format-inl.h"
+#ifndef SPDLOG_COMPILED_LIB
+    #error Please define SPDLOG_COMPILED_LIB to compile this file.
+#endif
+#if !defined(SPDLOG_FMT_EXTERNAL) && !defined(SPDLOG_USE_STD_FORMAT)
+    #include <spdlog/fmt/bundled/format-inl.h>
 FMT_BEGIN_NAMESPACE
 namespace detail {
@@ -41,3 +44,5 @@ template FMT_API void buffer<wchar_t>::append(const wchar_t*, const wchar_t*);
 }  // namespace detail
 FMT_END_NAMESPACE
+#endif  // !SPDLOG_FMT_EXTERNAL

package/deps/couchbase-cxx-client/CMakeLists.txt CHANGED Viewed

@@ -21,7 +21,7 @@ endif()
 project(
   couchbase_cxx_client
-  VERSION "1.0.4"
+  VERSION "1.0.5"
   LANGUAGES CXX C)
 message(STATUS "Couchbase C++ client ${couchbase_cxx_client_VERSION} build ${couchbase_cxx_client_BUILD_NUMBER}, master: ${COUCHBASE_CXX_CLIENT_MASTER_PROJECT}")
 message(STATUS "System: ${CMAKE_SYSTEM_NAME}, ${CMAKE_SYSTEM_VERSION}, ${CMAKE_SYSTEM_PROCESSOR}")
@@ -515,7 +515,6 @@ foreach(TARGET ${couchbase_cxx_client_LIBRARIES})
     ${TARGET}
     PRIVATE project_options
             project_warnings
-            fmt::fmt
             spdlog::spdlog
             Microsoft.GSL::GSL
             asio

package/deps/couchbase-cxx-client/README.md CHANGED Viewed

@@ -21,9 +21,9 @@ CPMAddPackage(
   NAME
   couchbase_cxx_client
   GIT_TAG
-  1.0.4
+  1.0.5
   VERSION
-  1.0.4
+  1.0.5
   GITHUB_REPOSITORY
   "couchbase/couchbase-cxx-client"
   OPTIONS

package/deps/couchbase-cxx-client/cmake/Backtrace.cmake CHANGED Viewed

@@ -29,7 +29,9 @@ if(HAVE_DLADDR)
 endif()
 if(HAVE_BACKTRACE OR HAVE_DLADDR)
-  target_compile_options(project_options INTERFACE -ggdb3)
+  if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+    target_compile_options(project_options INTERFACE -ggdb3)
+  endif()
   target_link_libraries(project_options INTERFACE -rdynamic)
   add_definitions(-D_GNU_SOURCE=1)
 endif()

package/deps/couchbase-cxx-client/cmake/CPM.cmake CHANGED Viewed

@@ -1,4 +1,4 @@
-set(CPM_DOWNLOAD_VERSION 0.38.6)
+set(CPM_DOWNLOAD_VERSION 0.40.5)
 if(CPM_SOURCE_CACHE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")

package/deps/couchbase-cxx-client/cmake/Testing.cmake CHANGED Viewed

@@ -55,7 +55,6 @@ macro(integration_test name)
     Microsoft.GSL::GSL
     asio
     taocpp::json
-    fmt::fmt
     spdlog::spdlog
     test_utils)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
@@ -101,7 +100,6 @@ macro(transaction_test name)
     asio
     taocpp::json
     spdlog::spdlog
-    fmt::fmt
     ${couchbase_cxx_client_DEFAULT_LIBRARY}
     test_utils)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
@@ -146,7 +144,6 @@ macro(unit_test name)
     asio
     taocpp::json
     spdlog::spdlog
-    fmt::fmt
     ${couchbase_cxx_client_DEFAULT_LIBRARY}
     test_utils)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
@@ -193,7 +190,6 @@ macro(integration_benchmark name)
     asio
     taocpp::json
     spdlog::spdlog
-    fmt::fmt
     ${couchbase_cxx_client_DEFAULT_LIBRARY}
     test_utils)
   if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)

package/deps/couchbase-cxx-client/cmake/ThirdPartyDependencies.cmake CHANGED Viewed

@@ -2,6 +2,8 @@
 include(cmake/CPM.cmake)
+set(CPM_USE_LOCAL_PACKAGES OFF)
 # https://cmake.org/cmake/help/v3.28/policy/CMP0063.html
 set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
@@ -15,36 +17,13 @@ function(declare_system_library target)
                                              $<TARGET_PROPERTY:${target},INTERFACE_INCLUDE_DIRECTORIES>)
 endfunction()
-if(NOT TARGET fmt::fmt)
-  # https://github.com/fmtlib/fmt/releases
-  cpmaddpackage(
-    NAME
-    fmt
-    GIT_TAG
-    11.0.1
-    VERSION
-    11.0.1
-    GITHUB_REPOSITORY
-    "fmtlib/fmt"
-    EXCLUDE_FROM_ALL ON
-    OPTIONS
-    "FMT_INSTALL OFF"
-    # Unicode support for MSVC enabled in CompilerWarnings.cmake
-    "FMT_UNICODE OFF"
-    "FMT_DOC OFF"
-    "BUILD_SHARED_LIBS OFF"
-    "CMAKE_C_VISIBILITY_PRESET hidden"
-    "CMAKE_CXX_VISIBILITY_PRESET hidden"
-    "CMAKE_POSITION_INDEPENDENT_CODE ON")
-endif()
 if(NOT TARGET spdlog::spdlog)
   # https://github.com/gabime/spdlog/releases
   cpmaddpackage(
     NAME
     spdlog
     VERSION
-    1.14.1
+    1.15.0
     GITHUB_REPOSITORY
     "gabime/spdlog"
     EXCLUDE_FROM_ALL ON
@@ -54,8 +33,11 @@ if(NOT TARGET spdlog::spdlog)
     "CMAKE_C_VISIBILITY_PRESET hidden"
     "CMAKE_CXX_VISIBILITY_PRESET hidden"
     "CMAKE_POSITION_INDEPENDENT_CODE ON"
+    "NO_CMAKE_SYSTEM_PATH ON"
+    "NO_CMAKE_INSTALL_PREFIX ON"
+    "NO_CMAKE_SYSTEM_PACKAGE_REGISTRY ON"
     "SPDLOG_BUILD_SHARED OFF"
-    "SPDLOG_FMT_EXTERNAL ON")
+    "SPDLOG_FMT_EXTERNAL OFF")
 endif()
 if(NOT TARGET Microsoft.GSL::GSL)
@@ -246,6 +228,5 @@ declare_system_library(llhttp::llhttp)
 declare_system_library(hdr_histogram_static)
 declare_system_library(Microsoft.GSL::GSL)
 declare_system_library(spdlog::spdlog)
-declare_system_library(fmt::fmt)
 declare_system_library(asio)
 declare_system_library(taocpp::json)

package/deps/couchbase-cxx-client/core/agent_config.cxx CHANGED Viewed

@@ -15,7 +15,7 @@
 #include "agent_config.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <string>

package/deps/couchbase-cxx-client/core/agent_group_config.cxx CHANGED Viewed

@@ -15,7 +15,7 @@
 #include "agent_group_config.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <string>

package/deps/couchbase-cxx-client/core/bucket.cxx CHANGED Viewed

@@ -52,8 +52,8 @@
 #include <asio/io_context.hpp>
 #include <asio/post.hpp>
 #include <asio/ssl/context.hpp>
-#include <fmt/format.h>
 #include <gsl/span>
+#include <spdlog/fmt/bundled/core.h>
 #include <algorithm>
 #include <chrono>
@@ -225,8 +225,8 @@ public:
     return {};
   }
-  auto direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req,
-                       bool is_retry) -> std::error_code
+  auto direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req, bool is_retry)
+    -> std::error_code
   {
     auto handle_error = [is_retry, req](std::error_code ec) {
       // We only want to log an error on retries if the error isn't cancelled.
@@ -281,8 +281,8 @@ public:
     return {};
   }
-  auto backoff_and_retry(const std::shared_ptr<mcbp::queue_request>& request,
-                         retry_reason reason) -> bool
+  auto backoff_and_retry(const std::shared_ptr<mcbp::queue_request>& request, retry_reason reason)
+    -> bool
   {
     auto action = retry_orchestrator::should_retry(request, reason);
     auto retried = action.need_to_retry();
@@ -314,8 +314,8 @@ public:
     return {};
   }
-  [[nodiscard]] auto server_by_vbucket(std::uint16_t vbucket,
-                                       std::size_t node_index) -> std::optional<std::size_t>
+  [[nodiscard]] auto server_by_vbucket(std::uint16_t vbucket, std::size_t node_index)
+    -> std::optional<std::size_t>
   {
     const std::scoped_lock lock(config_mutex_);
     if (config_) {
@@ -1141,8 +1141,8 @@ bucket::direct_dispatch(std::shared_ptr<mcbp::queue_request> req) -> std::error_
 }
 auto
-bucket::direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req,
-                        bool is_retry) -> std::error_code
+bucket::direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req, bool is_retry)
+  -> std::error_code
 {
   return impl_->direct_re_queue(req, is_retry);
 }

package/deps/couchbase-cxx-client/core/cluster.cxx CHANGED Viewed

@@ -164,12 +164,10 @@
 #include <asio/executor_work_guard.hpp>
 #include <asio/post.hpp>
 #include <asio/ssl/verify_mode.hpp>
-#include <fmt/core.h>
 #include <atomic>
 #include <chrono>
 #include <cstring>
-#include <fmt/format.h>
 #include <map>
 #include <memory>
 #include <mutex>

package/deps/couchbase-cxx-client/core/cluster_agent_config.cxx CHANGED Viewed

@@ -15,7 +15,7 @@
 #include "cluster_agent_config.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <string>

package/deps/couchbase-cxx-client/core/collections_component.cxx CHANGED Viewed

@@ -42,7 +42,7 @@
 #include <asio/error.hpp>
 #include <asio/io_context.hpp>
 #include <asio/steady_timer.hpp>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 #include <tao/pegtl/parse_error.hpp>
 #include <tl/expected.hpp>

package/deps/couchbase-cxx-client/core/columnar/agent_config.cxx CHANGED Viewed

@@ -17,8 +17,8 @@
 #include "agent_config.hxx"
-#include <fmt/chrono.h>
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <string>

package/deps/couchbase-cxx-client/core/columnar/error.hxx CHANGED Viewed

@@ -18,7 +18,6 @@
 #pragma once
 #include <cstdint>
-#include <map>
 #include <memory>
 #include <string>
 #include <system_error>

package/deps/couchbase-cxx-client/core/columnar/query_component.cxx CHANGED Viewed

@@ -33,9 +33,9 @@
 #include <asio/io_context.hpp>
 #include <asio/steady_timer.hpp>
-#include <fmt/chrono.h>
-#include <fmt/format.h>
 #include <gsl/util>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 #include <tl/expected.hpp>

package/deps/couchbase-cxx-client/core/config_profiles.cxx CHANGED Viewed

@@ -20,7 +20,7 @@
 #include "cluster_options.hxx"
 #include "core/config_profile.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <chrono>
 #include <mutex>

package/deps/couchbase-cxx-client/core/core_sdk_shim.cxx CHANGED Viewed

@@ -15,7 +15,7 @@
 #include "core_sdk_shim.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <string>

package/deps/couchbase-cxx-client/core/crud_component.cxx CHANGED Viewed

@@ -39,11 +39,11 @@
 #include <asio/error.hpp>
 #include <asio/io_context.hpp>
 #include <asio/steady_timer.hpp>
-#include <fmt/format.h>
 #include <gsl/span>
 #include <gsl/span_ext>
 #include <gsl/util>
 #include <snappy.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 #include <tl/expected.hpp>

package/deps/couchbase-cxx-client/core/design_document_namespace_fmt.hxx CHANGED Viewed

@@ -19,7 +19,7 @@
 #include "design_document_namespace.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 template<>
 struct fmt::formatter<couchbase::core::design_document_namespace> {

package/deps/couchbase-cxx-client/core/diagnostics_fmt.hxx CHANGED Viewed

@@ -19,7 +19,7 @@
 #include "diagnostics.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 template<>
 struct fmt::formatter<couchbase::core::diag::cluster_state> {

package/deps/couchbase-cxx-client/core/document_id.cxx CHANGED Viewed

@@ -20,7 +20,7 @@
 #include "core/utils/binary.hxx"
 #include "core/utils/unsigned_leb128.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <algorithm>
 #include <cstddef>

package/deps/couchbase-cxx-client/core/document_id_fmt.hxx CHANGED Viewed

@@ -19,7 +19,7 @@
 #include "document_id.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 template<>
 struct fmt::formatter<couchbase::core::document_id> {

package/deps/couchbase-cxx-client/core/error_context/analytics_json.hxx CHANGED Viewed

@@ -21,11 +21,13 @@
 #include "core/impl/retry_reason.hxx"
 #include <couchbase/error_codes.hxx>
-#include <couchbase/fmt/retry_reason.hxx>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/forward.hpp>
 #include <tao/json/value.hpp>
+#include <couchbase/fmt/retry_reason.hxx>
 namespace tao::json
 {
 template<>

package/deps/couchbase-cxx-client/core/error_context/key_value_json.hxx CHANGED Viewed

@@ -22,7 +22,7 @@
 #include "key_value_error_context.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 #include <tao/json/forward.hpp>
 namespace tao::json

package/deps/couchbase-cxx-client/core/error_context/query_public_json.hxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include <couchbase/fmt/retry_reason.hxx>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 #include <tao/json/forward.hpp>
 namespace tao::json

package/deps/couchbase-cxx-client/core/error_context/subdocument_json.hxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include <couchbase/fmt/retry_reason.hxx>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 #include <tao/json/forward.hpp>
 #include "key_value_json.hxx"

package/deps/couchbase-cxx-client/core/fmt/key_value_error_map_attribute.hxx CHANGED Viewed

@@ -19,7 +19,7 @@
 #include "core/error_context/key_value_error_map_attribute.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 template<>
 struct fmt::formatter<couchbase::core::key_value_error_map_attribute> {

package/deps/couchbase-cxx-client/core/fmt/key_value_extended_error_info.hxx CHANGED Viewed

@@ -19,7 +19,7 @@
 #include "core/error_context/key_value_extended_error_info.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 /**
  * Helper for fmtlib to format @ref couchbase::key_value_extended_error_info objects.

package/deps/couchbase-cxx-client/core/fmt/key_value_status_code.hxx CHANGED Viewed

@@ -19,7 +19,7 @@
 #include "core/error_context/key_value_status_code.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 /**
  * Helper for fmtlib to format @ref couchbase::core::key_value_status_code objects.

package/deps/couchbase-cxx-client/core/http_component.cxx CHANGED Viewed

@@ -25,7 +25,7 @@
 #include <couchbase/build_config.hxx>
 #include <asio/error.hpp>
-#include <fmt/chrono.h>
+#include <spdlog/fmt/bundled/chrono.h>
 #include <tl/expected.hpp>
 #include <memory>
@@ -269,8 +269,8 @@ public:
   ~pending_buffered_http_operation() override = default;
   pending_buffered_http_operation(const pending_buffered_http_operation&) = delete;
   pending_buffered_http_operation(pending_buffered_http_operation&&) = delete;
-  auto operator=(const pending_buffered_http_operation&) -> pending_buffered_http_operation =
-                                                              delete;
+  auto operator=(const pending_buffered_http_operation&)
+    -> pending_buffered_http_operation = delete;
   auto operator=(pending_buffered_http_operation&&) -> pending_buffered_http_operation = delete;
   void start(buffered_free_form_http_request_callback&& callback)

package/deps/couchbase-cxx-client/core/impl/best_effort_retry_strategy.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include <couchbase/retry_reason.hxx>
 #include <couchbase/retry_request.hxx>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <algorithm>
 #include <chrono>

package/deps/couchbase-cxx-client/core/impl/collection.cxx CHANGED Viewed

@@ -90,7 +90,7 @@
 #include <couchbase/unlock_options.hxx>
 #include <couchbase/upsert_options.hxx>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <chrono>
 #include <cstdint>

package/deps/couchbase-cxx-client/core/impl/date_range.cxx CHANGED Viewed

@@ -17,8 +17,8 @@
 #include <couchbase/date_range.hxx>
-#include <fmt/chrono.h>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <chrono>
 #include <ctime>

package/deps/couchbase-cxx-client/core/impl/date_range_query.cxx CHANGED Viewed

@@ -21,8 +21,8 @@
 #include <couchbase/error_codes.hxx>
-#include <fmt/chrono.h>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/type.hpp>
 #include <chrono>

package/deps/couchbase-cxx-client/core/impl/dns_srv_tracker.cxx CHANGED Viewed

@@ -31,7 +31,7 @@
 #include <asio/bind_executor.hpp>
 #include <asio/io_context.hpp>
 #include <asio/post.hpp>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <functional>
 #include <memory>

package/deps/couchbase-cxx-client/core/impl/error.cxx CHANGED Viewed

@@ -36,14 +36,16 @@
 #include "core/impl/internal_error_context.hxx"
 #include "core/transactions/exceptions.hxx"
 #include "core/transactions/internal/exceptions_internal.hxx"
-#include "core/transactions/internal/exceptions_internal_fmt.hxx"
 #include <couchbase/error.hxx>
 #include <couchbase/error_codes.hxx>
 #include <couchbase/error_context.hxx>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
+#include "core/transactions/internal/exceptions_internal_fmt.hxx"
 #include <memory>
 #include <optional>
 #include <string>

package/deps/couchbase-cxx-client/core/impl/expiry.cxx CHANGED Viewed

@@ -18,8 +18,8 @@
 #include <couchbase/error_codes.hxx>
 #include <couchbase/expiry.hxx>
-#include <fmt/chrono.h>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <chrono>
 #include <cstdint>

package/deps/couchbase-cxx-client/core/impl/fail_fast_retry_strategy.cxx CHANGED Viewed

@@ -20,8 +20,7 @@
 #include <couchbase/retry_reason.hxx>
 #include <couchbase/retry_request.hxx>
-#include <fmt/core.h>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 #include <memory>
 #include <string>

package/deps/couchbase-cxx-client/core/impl/key_value_error_context.cxx CHANGED Viewed

@@ -15,14 +15,16 @@
  *   limitations under the License.
  */
-#include <couchbase/fmt/cas.hxx>
-#include <couchbase/fmt/retry_reason.hxx>
 #include "core/error_context/key_value_error_context.hxx"
+#include <spdlog/fmt/bundled/core.h>
+#include <tao/json/to_string.hpp>
 #include "core/fmt/key_value_error_map_attribute.hxx"
 #include "core/fmt/key_value_status_code.hxx"
-#include <tao/json/to_string.hpp>
+#include <couchbase/fmt/cas.hxx>
+#include <couchbase/fmt/retry_reason.hxx>
 namespace couchbase::core
 {

package/deps/couchbase-cxx-client/core/impl/numeric_range.cxx CHANGED Viewed

@@ -17,7 +17,7 @@
 #include <couchbase/numeric_range.hxx>
-#include <fmt/chrono.h>
+#include <spdlog/fmt/bundled/chrono.h>
 namespace couchbase
 {