rroonga 7.1.1-x64-mingw32 → 9.0.2-x64-mingw32

data/vendor/local/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp

@@ -0,0 +1,45 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2017 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+#ifndef MSGPACK_V1_CPP11_CONVERT_HELPER_HPP
+#define MSGPACK_V1_CPP11_CONVERT_HELPER_HPP
+
+#include <tuple>
+
+#include <msgpack/object_fwd.hpp>
+
+namespace msgpack {
+/// @cond
+MSGPACK_API_VERSION_NAMESPACE(v1) {
+/// @endcond
+namespace type {
+
+template <typename T>
+inline typename std::enable_if<
+    has_as<T>::value
+>::type
+convert_helper(msgpack::object const& o, T& t) {
+    t = o.as<T>();
+}
+template <typename T>
+inline typename std::enable_if<
+    !has_as<T>::value
+>::type
+convert_helper(msgpack::object const& o, T& t) {
+    o.convert(t);
+}
+
+}  // namespace type
+
+/// @cond
+}  // MSGPACK_API_VERSION_NAMESPACE(v1)
+/// @endcond
+}  // namespace msgpack
+
+#endif // MSGPACK_V1_CPP11_CONVERT_HELPER_HPP

data/vendor/local/include/msgpack/v1/adaptor/detail/cpp11_define_array.hpp

@@ -11,6 +11,7 @@
 #define MSGPACK_V1_CPP11_DEFINE_ARRAY_HPP
 
 #include "msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp"
+#include "msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp"
 
 #include <tuple>
 
@@ -31,7 +32,7 @@ struct define_array_imp {
         define_array_imp<Tuple, N-1>::unpack(o, t);
         const size_t size = o.via.array.size;
         if(size <= N-1) { return; }
-        o.via.array.ptr[N-1].convert(std::get<N-1>(t));
+        convert_helper(o.via.array.ptr[N-1], std::get<N-1>(t));
     }
     static void object(msgpack::object* o, msgpack::zone& z, Tuple const& t) {
         define_array_imp<Tuple, N-1>::object(o, z, t);
@@ -48,7 +49,7 @@ struct define_array_imp<Tuple, 1> {
     static void unpack(msgpack::object const& o, Tuple& t) {
         const size_t size = o.via.array.size;
         if(size <= 0) { return; }
-        o.via.array.ptr[0].convert(std::get<0>(t));
+        convert_helper(o.via.array.ptr[0], std::get<0>(t));
     }
     static void object(msgpack::object* o, msgpack::zone& z, Tuple const& t) {
         o->via.array.ptr[0] = msgpack::object(std::get<0>(t), z);
@@ -77,7 +78,7 @@ struct define_array {
     void msgpack_object(msgpack::object* o, msgpack::zone& z) const
     {
         o->type = msgpack::type::ARRAY;
-        o->via.array.ptr = static_cast<msgpack::object*>(z.allocate_align(sizeof(msgpack::object)*sizeof...(Args)));
+        o->via.array.ptr = static_cast<msgpack::object*>(z.allocate_align(sizeof(msgpack::object)*sizeof...(Args), MSGPACK_ZONE_ALIGNOF(msgpack::object)));
         o->via.array.size = sizeof...(Args);
 
         define_array_imp<std::tuple<Args&...>, sizeof...(Args)>::object(o, z, a);

data/vendor/local/include/msgpack/v1/adaptor/detail/cpp11_define_map.hpp

@@ -11,6 +11,7 @@
 #define MSGPACK_V1_CPP11_DEFINE_MAP_HPP
 
 #include "msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp"
+#include "msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp"
 
 #include <tuple>
 #include <map>
@@ -34,7 +35,7 @@ struct define_map_imp {
         define_map_imp<Tuple, N-2>::unpack(o, t, kvmap);
         auto it = kvmap.find(std::get<N-2>(t));
         if (it != kvmap.end()) {
-            it->second->convert(std::get<N-1>(t));
+            convert_helper(*it->second, std::get<N-1>(t));
         }
     }
     static void object(msgpack::object* o, msgpack::zone& z, Tuple const& t) {
@@ -71,6 +72,7 @@ struct define_map {
         if(o.type != msgpack::type::MAP) { throw msgpack::type_error(); }
         std::map<std::string, msgpack::object const*> kvmap;
         for (uint32_t i = 0; i < o.via.map.size; ++i) {
+            if (o.via.map.ptr[i].key.type != msgpack::type::STR) { throw msgpack::type_error(); }
             kvmap.emplace(
                 std::string(
                     o.via.map.ptr[i].key.via.str.ptr,
@@ -83,7 +85,7 @@ struct define_map {
     {
         static_assert(sizeof...(Args) % 2 == 0, "");
         o->type = msgpack::type::MAP;
-        o->via.map.ptr = static_cast<msgpack::object_kv*>(z.allocate_align(sizeof(msgpack::object_kv)*sizeof...(Args)/2));
+        o->via.map.ptr = static_cast<msgpack::object_kv*>(z.allocate_align(sizeof(msgpack::object_kv)*sizeof...(Args)/2, MSGPACK_ZONE_ALIGNOF(msgpack::object_kv)));
         o->via.map.size = sizeof...(Args) / 2;
 
         define_map_imp<std::tuple<Args&...>, sizeof...(Args)>::object(o, z, a);

data/vendor/local/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple.hpp

@@ -146,7 +146,7 @@ struct MsgpackTupleConverter<Tuple, 0> {
 namespace adaptor {
 
 template <typename... Args>
-struct as<msgpack::type::tuple<Args...>, typename std::enable_if<msgpack::all_of<msgpack::has_as, Args...>::value>::type>  {
+struct as<msgpack::type::tuple<Args...>, typename std::enable_if<msgpack::any_of<msgpack::has_as, Args...>::value>::type>  {
     msgpack::type::tuple<Args...> operator()(
         msgpack::object const& o) const {
         if (o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
@@ -203,7 +203,7 @@ template <typename... Args>
         msgpack::object::with_zone& o,
         msgpack::type::tuple<Args...> const& v) const {
         o.type = msgpack::type::ARRAY;
-        o.via.array.ptr = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*sizeof...(Args)));
+        o.via.array.ptr = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*sizeof...(Args), MSGPACK_ZONE_ALIGNOF(msgpack::object)));
         o.via.array.size = sizeof...(Args);
         MsgpackTupleToObjectWithZone<decltype(v), sizeof...(Args)>::convert(o, v);
     }

data/vendor/local/include/msgpack/v1/adaptor/ext.hpp

@@ -104,7 +104,7 @@ struct object_with_zone<msgpack::type::ext> {
         // size limit has already been checked at ext's constructor
         uint32_t size = v.size();
         o.type = msgpack::type::EXT;
-        char* ptr = static_cast<char*>(o.zone.allocate_align(size + 1));
+        char* ptr = static_cast<char*>(o.zone.allocate_align(size + 1, MSGPACK_ZONE_ALIGNOF(char)));
         o.via.ext.ptr = ptr;
         o.via.ext.size = size;
         ptr[0] = static_cast<char>(v.type());

data/vendor/local/include/msgpack/v1/adaptor/fixint.hpp

@@ -201,75 +201,91 @@ struct object<type::fix_int64> {
 
 template <>
 struct object<type::fix_uint8> {
-    void operator()(msgpack::object& o, type::fix_uint8 v) const
-    { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v.get(); }
+    void operator()(msgpack::object& o, type::fix_uint8 v) const {
+        o.type = msgpack::type::POSITIVE_INTEGER;
+        o.via.u64 = v.get();
+    }
 };
 
 template <>
 struct object<type::fix_uint16> {
-    void operator()(msgpack::object& o, type::fix_uint16 v) const
-    { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v.get(); }
+    void operator()(msgpack::object& o, type::fix_uint16 v) const {
+        o.type = msgpack::type::POSITIVE_INTEGER;
+        o.via.u64 = v.get();
+    }
 };
 
 template <>
 struct object<type::fix_uint32> {
-    void operator()(msgpack::object& o, type::fix_uint32 v) const
-    { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v.get(); }
+    void operator()(msgpack::object& o, type::fix_uint32 v) const {
+        o.type = msgpack::type::POSITIVE_INTEGER;
+        o.via.u64 = v.get();
+    }
 };
 
 template <>
 struct object<type::fix_uint64> {
-    void operator()(msgpack::object& o, type::fix_uint64 v) const
-    { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v.get(); }
+    void operator()(msgpack::object& o, type::fix_uint64 v) const {
+        o.type = msgpack::type::POSITIVE_INTEGER;
+        o.via.u64 = v.get();
+    }
 };
 
 template <>
 struct object_with_zone<type::fix_int8> {
-    void operator()(msgpack::object::with_zone& o, type::fix_int8 v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, type::fix_int8 v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<type::fix_int16> {
-    void operator()(msgpack::object::with_zone& o, type::fix_int16 v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, type::fix_int16 v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<type::fix_int32> {
-    void operator()(msgpack::object::with_zone& o, type::fix_int32 v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, type::fix_int32 v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<type::fix_int64> {
-    void operator()(msgpack::object::with_zone& o, type::fix_int64 v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, type::fix_int64 v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 
 template <>
 struct object_with_zone<type::fix_uint8> {
-    void operator()(msgpack::object::with_zone& o, type::fix_uint8 v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, type::fix_uint8 v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<type::fix_uint16> {
-    void operator()(msgpack::object::with_zone& o, type::fix_uint16 v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, type::fix_uint16 v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<type::fix_uint32> {
-    void operator()(msgpack::object::with_zone& o, type::fix_uint32 v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, type::fix_uint32 v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<type::fix_uint64> {
-    void operator()(msgpack::object::with_zone& o, type::fix_uint64 v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, type::fix_uint64 v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 } // namespace adaptor

data/vendor/local/include/msgpack/v1/adaptor/float.hpp

@@ -27,7 +27,7 @@ namespace adaptor {
 template <>
 struct convert<float> {
     msgpack::object const& operator()(msgpack::object const& o, float& v) const {
-        if(o.type == msgpack::type::FLOAT) {
+        if(o.type == msgpack::type::FLOAT32 || o.type == msgpack::type::FLOAT64) {
             v = static_cast<float>(o.via.f64);
         }
         else if (o.type == msgpack::type::POSITIVE_INTEGER) {
@@ -56,7 +56,7 @@ struct pack<float> {
 template <>
 struct convert<double> {
     msgpack::object const& operator()(msgpack::object const& o, double& v) const {
-        if(o.type == msgpack::type::FLOAT) {
+        if(o.type == msgpack::type::FLOAT32 || o.type == msgpack::type::FLOAT64) {
             v = o.via.f64;
         }
         else if (o.type == msgpack::type::POSITIVE_INTEGER) {
@@ -85,7 +85,7 @@ struct pack<double> {
 template <>
 struct object<float> {
     void operator()(msgpack::object& o, float v) const {
-        o.type = msgpack::type::FLOAT;
+        o.type = msgpack::type::FLOAT32;
         o.via.f64 = static_cast<double>(v);
     }
 };
@@ -93,7 +93,7 @@ struct object<float> {
 template <>
 struct object<double> {
     void operator()(msgpack::object& o, double v) const {
-        o.type = msgpack::type::FLOAT;
+        o.type = msgpack::type::FLOAT64;
         o.via.f64 = v;
     }
 };

data/vendor/local/include/msgpack/v1/adaptor/int.hpp

@@ -82,7 +82,8 @@ struct object_char_sign<true> {
 template <>
 struct object_char_sign<false> {
     static void make(msgpack::object& o, char v) {
-        o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v;
+        o.type = msgpack::type::POSITIVE_INTEGER;
+        o.via.u64 = v;
     }
 };
 
@@ -320,99 +321,120 @@ struct object<signed long long> {
 
 template <>
 struct object<unsigned char> {
-    void operator()(msgpack::object& o, unsigned char v) const
-    { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; }
+    void operator()(msgpack::object& o, unsigned char v) const {
+        o.type = msgpack::type::POSITIVE_INTEGER;
+        o.via.u64 = v;
+    }
 };
 
 template <>
 struct object<unsigned short> {
-    void operator()(msgpack::object& o, unsigned short v) const
-    { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; }
+    void operator()(msgpack::object& o, unsigned short v) const {
+        o.type = msgpack::type::POSITIVE_INTEGER;
+        o.via.u64 = v;
+    }
 };
 
 template <>
 struct object<unsigned int> {
-    void operator()(msgpack::object& o, unsigned int v) const
-    { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; }
+    void operator()(msgpack::object& o, unsigned int v) const {
+        o.type = msgpack::type::POSITIVE_INTEGER;
+        o.via.u64 = v;
+    }
 };
 
 template <>
 struct object<unsigned long> {
-    void operator()(msgpack::object& o, unsigned long v) const
-    { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; }
+    void operator()(msgpack::object& o, unsigned long v) const {
+        o.type = msgpack::type::POSITIVE_INTEGER;
+        o.via.u64 = v;
+    }
 };
 
 template <>
 struct object<unsigned long long> {
-    void operator()(msgpack::object& o, unsigned long long v) const
-    { o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; }
+    void operator()(msgpack::object& o, unsigned long long v) const {
+        o.type = msgpack::type::POSITIVE_INTEGER;
+        o.via.u64 = v;
+    }
 };
 
 
 template <>
 struct object_with_zone<char> {
-    void operator()(msgpack::object::with_zone& o, char v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, char v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<signed char> {
-    void operator()(msgpack::object::with_zone& o, signed char v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, signed char v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<signed short> {
-    void operator()(msgpack::object::with_zone& o, signed short v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, signed short v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<signed int> {
-    void operator()(msgpack::object::with_zone& o, signed int v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, signed int v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<signed long> {
-    void operator()(msgpack::object::with_zone& o, signed long v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, signed long v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<signed long long> {
-    void operator()(msgpack::object::with_zone& o, const signed long long& v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, const signed long long& v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<unsigned char> {
-    void operator()(msgpack::object::with_zone& o, unsigned char v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, unsigned char v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<unsigned short> {
-    void operator()(msgpack::object::with_zone& o, unsigned short v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, unsigned short v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<unsigned int> {
-    void operator()(msgpack::object::with_zone& o, unsigned int v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, unsigned int v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<unsigned long> {
-    void operator()(msgpack::object::with_zone& o, unsigned long v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, unsigned long v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 template <>
 struct object_with_zone<unsigned long long> {
-    void operator()(msgpack::object::with_zone& o, const unsigned long long& v) const
-    { static_cast<msgpack::object&>(o) << v; }
+    void operator()(msgpack::object::with_zone& o, const unsigned long long& v) const {
+        static_cast<msgpack::object&>(o) << v;
+    }
 };
 
 } // namespace adaptor