Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update dependencies #57

Closed
wants to merge 1 commit into from
Closed

update dependencies #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/serdepp/meta.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <type_traits>
#include <utility>
#include <string_view>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <memory>

#ifndef __SERDEPP_META_HPP__
Expand All @@ -37,7 +37,7 @@ namespace serde::meta {
struct tuple_extend<Input, void> {
using type = std::tuple<Input>;
};

template<class Input, class... Args>
struct tuple_extend<Input, std::tuple<Args...>> {
using type = std::tuple<Args..., Input>;
Expand Down Expand Up @@ -136,7 +136,7 @@ namespace serde::meta {
// inline constexpr auto init() { throw serde::unimplemented_error("weakptr not suppport"); }
// constexpr static bool value = true;
//};

template<typename T> inline constexpr auto is_pointer_v = is_pointer<T>::value;
template<typename T> inline constexpr auto is_pointer_t = is_pointer<T>::type;

Expand Down
14 changes: 7 additions & 7 deletions include/serdepp/serializer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <variant>
#include <string_view>
#include <nameof.hpp>
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <functional>
#include <algorithm>
#include "serdepp/meta.hpp"
Expand Down Expand Up @@ -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; }
};
};

Expand All @@ -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_++; }
};

Expand Down Expand Up @@ -214,7 +214,7 @@ namespace serde
}

template<typename T, typename serde_ctx>
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<T, serde_ctx>::into(ctx, data, key);
}
};
Expand Down Expand Up @@ -347,7 +347,7 @@ namespace serde
}
return serde_struct<Context, T, type_tuple>(context_, value_);
}

inline constexpr serde_struct& no_remain() {
using namespace std::literals;
if(context_.skip_all_) return *this;
Expand Down Expand Up @@ -562,7 +562,7 @@ namespace serde
case SERDE_TYPE::MAP:
if(!serde_type_checker<Format>::is_map(format)) return true;
break;
case SERDE_TYPE::STRUCT:
case SERDE_TYPE::STRUCT:
if(!serde_type_checker<Format>::is_struct(format)) return true;
break;
case SERDE_TYPE::INTEGER:
Expand All @@ -578,7 +578,7 @@ namespace serde
if(!serde_type_checker<Format>::is_string(format)) return true;
break;
default: return true;
//case SERDE_TYPE::UNKNOWN:
//case SERDE_TYPE::UNKNOWN:
}
try {
data = deserialize<T>(format);
Expand Down