diff --git a/3rdparty/include/meojson/json_array.h b/3rdparty/include/meojson/json_array.h index bb5f58661d..4864f8a6a3 100644 --- a/3rdparty/include/meojson/json_array.h +++ b/3rdparty/include/meojson/json_array.h @@ -26,7 +26,7 @@ namespace json template array(ArrayType arr) { static_assert( - std::is_constructible::value, + std::is_constructible::value, "Parameter can't be used to construct a json::value"); for (auto&& ele : arr) { _array_data.emplace_back(std::move(ele)); @@ -68,11 +68,15 @@ namespace json iterator begin() noexcept; iterator end() noexcept; + const_iterator begin() const noexcept; + const_iterator end() const noexcept; const_iterator cbegin() const noexcept; const_iterator cend() const noexcept; reverse_iterator rbegin() noexcept; reverse_iterator rend() noexcept; + const_reverse_iterator rbegin() const noexcept; + const_reverse_iterator rend() const noexcept; const_reverse_iterator crbegin() const noexcept; const_reverse_iterator crend() const noexcept; diff --git a/3rdparty/include/meojson/json_aux.cpp b/3rdparty/include/meojson/json_aux.cpp deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/3rdparty/include/meojson/json_object.h b/3rdparty/include/meojson/json_object.h index 9fd5ec3d0b..ae3d414a97 100644 --- a/3rdparty/include/meojson/json_object.h +++ b/3rdparty/include/meojson/json_object.h @@ -4,10 +4,10 @@ #include #include +#include "json_value.h" + namespace json { - class value; - class object { public: @@ -24,18 +24,18 @@ namespace json template object(MapType map) { static_assert( - std::is_constructible::value, + std::is_constructible::value, "Parameter can't be used to construct a json::object::raw_object::value_type"); for (auto&& ele : map) { _object_data.emplace(std::move(ele)); } } - + ~object() = default; bool empty() const noexcept { return _object_data.empty(); } size_t size() const noexcept { return _object_data.size(); } - bool exist(const std::string& key) const; + bool exist(const std::string& key) const { return _object_data.find(key) != _object_data.cend(); } const value& at(const std::string& key) const; const std::string to_string() const; const std::string format(std::string shift_str = " ", size_t basic_shift_count = 0) const; @@ -66,6 +66,8 @@ namespace json iterator begin() noexcept; iterator end() noexcept; + const_iterator begin() const noexcept; + const_iterator end() const noexcept; const_iterator cbegin() const noexcept; const_iterator cend() const noexcept; diff --git a/3rdparty/lib/libmeojson.lib b/3rdparty/lib/libmeojson.lib index d9378a15d0..6d174836e4 100644 Binary files a/3rdparty/lib/libmeojson.lib and b/3rdparty/lib/libmeojson.lib differ