From a37be8c9e5c772b255d36145874b580c2a271467 Mon Sep 17 00:00:00 2001 From: toge Date: Sun, 19 Nov 2023 13:20:18 +0900 Subject: [PATCH] update dependencies --- CMakeLists.txt | 12 ++++++------ include/serdepp/meta.hpp | 6 +++--- include/serdepp/serializer.hpp | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 98d9944..6632a66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,13 +14,13 @@ cppm_compiler_option( find_cppkg(benchmark 1.5.2 MODULE benchmark::benchmark TYPE lib OPTIONAL OFF) find_cppkg(RapidJSON 1.1.1 MODULE rapidjson TYPE lib OPTIONAL OFF) -find_cppkg(nlohmann_json 3.10.5 MODULE nlohmann_json::nlohmann_json TYPE lib OPTIONAL OFF) +find_cppkg(nlohmann_json 3.11.2 MODULE nlohmann_json::nlohmann_json TYPE lib OPTIONAL OFF) find_cppkg(Catch2 2.9.1 MODULE Catch2::Catch2 TYPE lib OPTIONAL OFF) -find_cppkg(toml11 3.7.0 MODULE toml11::toml11 TYPE lib OPTIONAL OFF) -find_cppkg(yaml-cpp 0.7.0 MODULE yaml-cpp TYPE lib OPTIONAL OFF) -find_cppkg(fmt 8.0.1 MODULE fmt::fmt-header-only TYPE lib OPTIONAL OFF) -find_cppkg(magic_enum 0.7.3 MODULE magic_enum::magic_enum TYPE lib) -find_cppkg(nameof 0.10.0 MODULE nameof::nameof TYPE lib) +find_cppkg(toml11 3.7.1 MODULE toml11::toml11 TYPE lib OPTIONAL OFF) +find_cppkg(yaml-cpp 0.8.0 MODULE yaml-cpp TYPE lib OPTIONAL OFF) +find_cppkg(fmt 10.1.1 MODULE fmt::fmt-header-only TYPE lib OPTIONAL OFF) +find_cppkg(magic_enum 0.9.5 MODULE magic_enum::magic_enum TYPE lib) +find_cppkg(nameof 0.10.3 MODULE nameof::nameof TYPE lib) cppm_target_define(serdepp STATIC diff --git a/include/serdepp/meta.hpp b/include/serdepp/meta.hpp index d0a607a..e51df17 100644 --- a/include/serdepp/meta.hpp +++ b/include/serdepp/meta.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #ifndef __SERDEPP_META_HPP__ @@ -37,7 +37,7 @@ namespace serde::meta { struct tuple_extend { using type = std::tuple; }; - + template struct tuple_extend> { using type = std::tuple; @@ -136,7 +136,7 @@ namespace serde::meta { // inline constexpr auto init() { throw serde::unimplemented_error("weakptr not suppport"); } // constexpr static bool value = true; //}; - + template inline constexpr auto is_pointer_v = is_pointer::value; template inline constexpr auto is_pointer_t = is_pointer::type; diff --git a/include/serdepp/serializer.hpp b/include/serdepp/serializer.hpp index 2e984af..149a9f6 100644 --- a/include/serdepp/serializer.hpp +++ b/include/serdepp/serializer.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include "serdepp/meta.hpp" @@ -76,7 +76,7 @@ namespace serde namespace detail { struct dummy_adaptor{ bool contains(std::string_view key) { return true; } - size_t size() { return 1; } + size_t size() { return 1; } }; }; @@ -92,7 +92,7 @@ namespace serde constexpr serde_context(T& format) : adaptor(format) {} T& adaptor; size_t read_count_ = 0; - bool skip_all_ = false; + bool skip_all_ = false; constexpr void read() { read_count_++; } }; @@ -214,7 +214,7 @@ namespace serde } template - inline void into(serde_ctx& ctx, T& data, std::string_view key) const { + inline void into(serde_ctx& ctx, T& data, std::string_view key) const { serde::serde_serializer::into(ctx, data, key); } }; @@ -347,7 +347,7 @@ namespace serde } return serde_struct(context_, value_); } - + inline constexpr serde_struct& no_remain() { using namespace std::literals; if(context_.skip_all_) return *this; @@ -562,7 +562,7 @@ namespace serde case SERDE_TYPE::MAP: if(!serde_type_checker::is_map(format)) return true; break; - case SERDE_TYPE::STRUCT: + case SERDE_TYPE::STRUCT: if(!serde_type_checker::is_struct(format)) return true; break; case SERDE_TYPE::INTEGER: @@ -578,7 +578,7 @@ namespace serde if(!serde_type_checker::is_string(format)) return true; break; default: return true; - //case SERDE_TYPE::UNKNOWN: + //case SERDE_TYPE::UNKNOWN: } try { data = deserialize(format);