rroonga 6.0.5-x64-mingw32 → 6.0.7-x64-mingw32

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

@@ -10,228 +10,8 @@
 #ifndef MSGPACK_TYPE_EXT_HPP
 #define MSGPACK_TYPE_EXT_HPP
 
-#include "msgpack/versioning.hpp"
-#include "msgpack/adaptor/adaptor_base.hpp"
-#include <cstring>
-#include <string>
-#include <cassert>
+#include "msgpack/adaptor/ext_decl.hpp"
 
-namespace msgpack {
+#include "msgpack/v1/adaptor/ext.hpp"
 
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-namespace type {
-class ext_ref;
-
-class ext {
-public:
-    ext() : m_data(1, 0) {}
-    ext(int8_t t, const char* p, uint32_t s) {
-        detail::check_container_size_for_ext<sizeof(std::size_t)>(s);
-        m_data.reserve(static_cast<std::size_t>(s) + 1);
-        m_data.push_back(static_cast<char>(t));
-        m_data.insert(m_data.end(), p, p + s);
-    }
-    ext(int8_t t, uint32_t s) {
-        detail::check_container_size_for_ext<sizeof(std::size_t)>(s);
-        m_data.resize(static_cast<std::size_t>(s) + 1);
-        m_data[0] = static_cast<char>(t);
-    }
-    ext(ext_ref const&);
-    int8_t type() const {
-        return static_cast<int8_t>(m_data[0]);
-    }
-    const char* data() const {
-        return &m_data[1];
-    }
-    char* data() {
-        return &m_data[1];
-    }
-    uint32_t size() const {
-        return static_cast<uint32_t>(m_data.size()) - 1;
-    }
-    bool operator== (const ext& x) const {
-        return m_data == x.m_data;
-    }
-
-    bool operator!= (const ext& x) const {
-        return !(*this == x);
-    }
-
-    bool operator< (const ext& x) const {
-        return m_data < x.m_data;
-    }
-
-    bool operator> (const ext& x) const {
-        return m_data > x.m_data;
-    }
-private:
-    std::vector<char> m_data;
-    friend class ext_ref;
-};
-
-} // namespace type
-
-namespace adaptor {
-
-template <>
-struct convert<msgpack::type::ext> {
-    msgpack::object const& operator()(msgpack::object const& o, msgpack::type::ext& v) const {
-        if(o.type != msgpack::type::EXT) {
-            throw msgpack::type_error();
-        }
-        v = msgpack::type::ext(o.via.ext.type(), o.via.ext.data(), o.via.ext.size);
-        return o;
-    }
-};
-
-template <>
-struct pack<msgpack::type::ext> {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const msgpack::type::ext& v) const {
-        // size limit has already been checked at ext's constructor
-        uint32_t size = v.size();
-        o.pack_ext(size, v.type());
-        o.pack_ext_body(v.data(), size);
-        return o;
-    }
-};
-
-template <>
-struct object_with_zone<msgpack::type::ext> {
-    void operator()(msgpack::object::with_zone& o, const msgpack::type::ext& v) const {
-        // 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));
-        o.via.ext.ptr = ptr;
-        o.via.ext.size = size;
-        ptr[0] = static_cast<char>(v.type());
-        std::memcpy(ptr + 1, v.data(), size);
-    }
-};
-
-} // namespace adaptor
-
-namespace type {
-
-class ext_ref {
-public:
-    // ext_ref should be default constructible to support 'convert'.
-    // A default constructed ext_ref object::m_ptr doesn't have the buffer to point to.
-    // In order to avoid nullptr checking branches, m_ptr points to m_size.
-    // So type() returns unspecified but valid value. It might be a zero because m_size
-    // is initialized as zero, but shouldn't assume that.
-    ext_ref() : m_ptr(static_cast<char*>(static_cast<void*>(&m_size))), m_size(0) {}
-    ext_ref(const char* p, uint32_t s) :
-        m_ptr(s == 0 ? static_cast<char*>(static_cast<void*>(&m_size)) : p),
-        m_size(s == 0 ? 0 : s - 1) {
-        detail::check_container_size_for_ext<sizeof(std::size_t)>(s);
-    }
-
-    // size limit has already been checked at ext's constructor
-    ext_ref(ext const& x) : m_ptr(&x.m_data[0]), m_size(x.size()) {}
-
-    const char* data() const {
-        return m_ptr + 1;
-    }
-
-    uint32_t size() const {
-        return m_size;
-    }
-
-    int8_t type() const {
-        return static_cast<int8_t>(m_ptr[0]);
-    }
-
-    std::string str() const {
-        return std::string(m_ptr + 1, m_size);
-    }
-
-    bool operator== (const ext_ref& x) const {
-        return m_size == x.m_size && std::memcmp(m_ptr, x.m_ptr, m_size) == 0;
-    }
-
-    bool operator!= (const ext_ref& x) const {
-        return !(*this == x);
-    }
-
-    bool operator< (const ext_ref& x) const {
-        if (m_size < x.m_size) return true;
-        if (m_size > x.m_size) return false;
-        return std::memcmp(m_ptr, x.m_ptr, m_size) < 0;
-    }
-
-    bool operator> (const ext_ref& x) const {
-        if (m_size > x.m_size) return true;
-        if (m_size < x.m_size) return false;
-        return std::memcmp(m_ptr, x.m_ptr, m_size) > 0;
-    }
-private:
-    const char* m_ptr;
-    uint32_t m_size;
-    friend struct msgpack::adaptor::object<msgpack::type::ext_ref>;
-};
-
-inline ext::ext(ext_ref const& x) {
-    // size limit has already been checked at ext_ref's constructor
-    m_data.reserve(x.size() + 1);
-
-    m_data.push_back(x.type());
-    m_data.insert(m_data.end(), x.data(), x.data() + x.size());
-}
-
-} // namespace type
-
-namespace adaptor {
-
-template <>
-struct convert<msgpack::type::ext_ref> {
-    msgpack::object const& operator()(msgpack::object const& o, msgpack::type::ext_ref& v) const {
-        if(o.type != msgpack::type::EXT) { throw msgpack::type_error(); }
-        v = msgpack::type::ext_ref(o.via.ext.ptr, o.via.ext.size + 1);
-        return o;
-    }
-};
-
-template <>
-struct pack<msgpack::type::ext_ref> {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const msgpack::type::ext_ref& v) const {
-        // size limit has already been checked at ext_ref's constructor
-        uint32_t size = v.size();
-        o.pack_ext(size, v.type());
-        o.pack_ext_body(v.data(), size);
-        return o;
-    }
-};
-
-template <>
-struct object<msgpack::type::ext_ref> {
-    void operator()(msgpack::object& o, const msgpack::type::ext_ref& v) const {
-        // size limit has already been checked at ext_ref's constructor
-        uint32_t size = v.size();
-        o.type = msgpack::type::EXT;
-        o.via.ext.ptr = v.m_ptr;
-        o.via.ext.size = size;
-    }
-};
-
-template <>
-struct object_with_zone<msgpack::type::ext_ref> {
-    void operator()(msgpack::object::with_zone& o, const msgpack::type::ext_ref& v) const {
-        static_cast<msgpack::object&>(o) << v;
-    }
-};
-
-} // namespace adaptor
-
-/// @cond
-} // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-} // namespace msgpack
-
-#endif // MSGPACK_TYPE_EXT_HPP
+#endif //  MSGPACK_TYPE_EXT_HPP

data/vendor/local/include/msgpack/adaptor/ext_decl.hpp

@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2016 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_TYPE_EXT_DECL_HPP
+#define MSGPACK_TYPE_EXT_DECL_HPP
+
+#include "msgpack/v1/adaptor/ext_decl.hpp"
+#include "msgpack/v2/adaptor/ext_decl.hpp"
+
+#endif // MSGPACK_TYPE_EXT_DECL_HPP

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

@@ -1,7 +1,7 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2020 FURUHASHI Sadayuki
+// Copyright (C) 2016 FURUHASHI Sadayuki and KONDO Takatoshi
 //
 //    Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,289 +10,8 @@
 #ifndef MSGPACK_TYPE_FIXINT_HPP
 #define MSGPACK_TYPE_FIXINT_HPP
 
-#include "msgpack/versioning.hpp"
-#include "msgpack/adaptor/adaptor_base.hpp"
-#include "msgpack/adaptor/int.hpp"
+#include "msgpack/adaptor/fixint_decl.hpp"
 
-namespace msgpack {
+#include "msgpack/v1/adaptor/fixint.hpp"
 
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-namespace type {
-
-
-template <typename T>
-struct fix_int {
-    fix_int() : value(0) { }
-    fix_int(T value) : value(value) { }
-
-    operator T() const { return value; }
-
-    T get() const { return value; }
-
-private:
-    T value;
-};
-
-
-typedef fix_int<uint8_t>  fix_uint8;
-typedef fix_int<uint16_t> fix_uint16;
-typedef fix_int<uint32_t> fix_uint32;
-typedef fix_int<uint64_t> fix_uint64;
-
-typedef fix_int<int8_t>  fix_int8;
-typedef fix_int<int16_t> fix_int16;
-typedef fix_int<int32_t> fix_int32;
-typedef fix_int<int64_t> fix_int64;
-
-
-}  // namespace type
-
-namespace adaptor {
-
-template <>
-struct convert<type::fix_int8> {
-    msgpack::object const& operator()(msgpack::object const& o, type::fix_int8& v) const
-    { v = type::detail::convert_integer<int8_t>(o); return o; }
-};
-
-template <>
-struct convert<type::fix_int16> {
-    msgpack::object const& operator()(msgpack::object const& o, type::fix_int16& v) const
-    { v = type::detail::convert_integer<int16_t>(o); return o; }
-};
-
-template <>
-struct convert<type::fix_int32> {
-    msgpack::object const& operator()(msgpack::object const& o, type::fix_int32& v) const
-    { v = type::detail::convert_integer<int32_t>(o); return o; }
-};
-
-template <>
-struct convert<type::fix_int64> {
-    msgpack::object const& operator()(msgpack::object const& o, type::fix_int64& v) const
-    { v = type::detail::convert_integer<int64_t>(o); return o; }
-};
-
-
-template <>
-struct convert<type::fix_uint8> {
-    msgpack::object const& operator()(msgpack::object const& o, type::fix_uint8& v) const
-    { v = type::detail::convert_integer<uint8_t>(o); return o; }
-};
-
-template <>
-struct convert<type::fix_uint16> {
-    msgpack::object const& operator()(msgpack::object const& o, type::fix_uint16& v) const
-    { v = type::detail::convert_integer<uint16_t>(o); return o; }
-};
-
-template <>
-struct convert<type::fix_uint32> {
-    msgpack::object const& operator()(msgpack::object const& o, type::fix_uint32& v) const
-    { v = type::detail::convert_integer<uint32_t>(o); return o; }
-};
-
-template <>
-struct convert<type::fix_uint64> {
-    msgpack::object const& operator()(msgpack::object const& o, type::fix_uint64& v) const
-    { v = type::detail::convert_integer<uint64_t>(o); return o; }
-};
-
-template <>
-struct pack<type::fix_int8> {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const type::fix_int8& v) const
-    { o.pack_fix_int8(v); return o; }
-};
-
-template <>
-struct pack<type::fix_int16> {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const type::fix_int16& v) const
-    { o.pack_fix_int16(v); return o; }
-};
-
-template <>
-struct pack<type::fix_int32> {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const type::fix_int32& v) const
-    { o.pack_fix_int32(v); return o; }
-};
-
-template <>
-struct pack<type::fix_int64> {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const type::fix_int64& v) const
-    { o.pack_fix_int64(v); return o; }
-};
-
-
-template <>
-struct pack<type::fix_uint8> {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const type::fix_uint8& v) const
-    { o.pack_fix_uint8(v); return o; }
-};
-
-template <>
-struct pack<type::fix_uint16> {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const type::fix_uint16& v) const
-    { o.pack_fix_uint16(v); return o; }
-};
-
-template <>
-struct pack<type::fix_uint32> {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const type::fix_uint32& v) const
-    { o.pack_fix_uint32(v); return o; }
-};
-
-template <>
-struct pack<type::fix_uint64> {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const type::fix_uint64& v) const
-    { o.pack_fix_uint64(v); return o; }
-};
-
-template <>
-struct object<type::fix_int8> {
-    void operator()(msgpack::object& o, type::fix_int8 v) const {
-        if (v.get() < 0) {
-            o.type = msgpack::type::NEGATIVE_INTEGER;
-            o.via.i64 = v.get();
-        }
-        else {
-            o.type = msgpack::type::POSITIVE_INTEGER;
-            o.via.u64 = v.get();
-        }
-    }
-};
-
-template <>
-struct object<type::fix_int16> {
-    void operator()(msgpack::object& o, type::fix_int16 v) const {
-        if(v.get() < 0) {
-            o.type = msgpack::type::NEGATIVE_INTEGER;
-            o.via.i64 = v.get();
-        }
-        else {
-            o.type = msgpack::type::POSITIVE_INTEGER;
-            o.via.u64 = v.get();
-        }
-    }
-};
-
-template <>
-struct object<type::fix_int32> {
-    void operator()(msgpack::object& o, type::fix_int32 v) const {
-        if (v.get() < 0) {
-            o.type = msgpack::type::NEGATIVE_INTEGER;
-            o.via.i64 = v.get();
-        }
-        else {
-            o.type = msgpack::type::POSITIVE_INTEGER;
-            o.via.u64 = v.get();
-        }
-    }
-};
-
-template <>
-struct object<type::fix_int64> {
-    void operator()(msgpack::object& o, type::fix_int64 v) const {
-        if (v.get() < 0) {
-            o.type = msgpack::type::NEGATIVE_INTEGER;
-            o.via.i64 = v.get();
-        }
-        else {
-            o.type = msgpack::type::POSITIVE_INTEGER;
-            o.via.u64 = v.get();
-        }
-    }
-};
-
-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(); }
-};
-
-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(); }
-};
-
-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(); }
-};
-
-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(); }
-};
-
-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; }
-};
-
-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; }
-};
-
-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; }
-};
-
-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; }
-};
-
-
-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; }
-};
-
-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; }
-};
-
-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; }
-};
-
-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; }
-};
-
-} // namespace adaptor
-
-/// @cond
-}  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-}  // namespace msgpack
-
-#endif /* msgpack/type/fixint.hpp */
+#endif // MSGPACK_TYPE_FIXINT_HPP