⬆️ Update dependent fmt version to 10.0.0

yosh-matsuda · Jun 15, 2023 · 20256ff · 20256ff
1 parent 0fa16e7
commit 20256ff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(cpp_yyjson VERSION 0.0.1 LANGUAGES CXX)
+project(cpp_yyjson VERSION 0.2.0 LANGUAGES CXX)
 
 # check if the project is top-level
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
@@ -36,7 +36,7 @@ endif()
 # dependencies
 find_package(yyjson CONFIG REQUIRED)
 target_link_libraries(${PROJECT_NAME} INTERFACE yyjson::yyjson)
-find_package(fmt CONFIG REQUIRED)
+find_package(fmt 10.0.0 CONFIG REQUIRED)
 target_link_libraries(${PROJECT_NAME} INTERFACE fmt::fmt-header-only)
 find_package(nameof CONFIG REQUIRED)
 target_link_libraries(${PROJECT_NAME} INTERFACE nameof::nameof)

diff --git a/cmake/cpp_yyjsonConfig.cmake.in b/cmake/cpp_yyjsonConfig.cmake.in
@@ -4,7 +4,7 @@ set(CPPYYJSON_VERSION @PROJECT_VERSION@)
 
 include(CMakeFindDependencyMacro)
 find_dependency(yyjson CONFIG REQUIRED)
-find_dependency(fmt CONFIG REQUIRED)
+find_dependency(fmt 10.0.0 CONFIG REQUIRED)
 find_dependency(nameof CONFIG REQUIRED)
 
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")

diff --git a/include/cpp_yyjson.hpp b/include/cpp_yyjson.hpp
@@ -3913,25 +3913,25 @@ namespace yyjson
     };
 }  // namespace yyjson
 
-template <typename T>  // clang-format off
+template <typename T>
 requires requires(const T& t) {
+    // clang-format off
     {t.write()} -> std::same_as<yyjson::json_string>;
+    // clang-format on
 }
-class fmt::formatter<T>  // clang-format on
+struct fmt::formatter<T>
 {
-public:
-    constexpr auto parse(format_parse_context& ctx) const -> decltype(ctx.begin())
+    constexpr auto parse(fmt::format_parse_context& ctx) -> fmt::format_parse_context::iterator
     {
         const auto i = ctx.begin();
         if (i != ctx.end() && *i != '}')
         {
-            throw format_error("invalid format");
+            throw fmt::format_error("invalid format");
         }
         return i;
     }
 
-    template <typename FmtContext>
-    auto format(const T& t, FmtContext& ctx) const -> decltype(ctx.out())
+    auto format(const T& t, fmt::format_context& ctx) const -> fmt::format_context::iterator
     {
         return fmt::format_to(ctx.out(), "{}", t.write());
     }