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

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

@@ -0,0 +1,17 @@
+//
+// 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_SIZE_EQUAL_ONLY_HPP
+#define MSGPACK_TYPE_SIZE_EQUAL_ONLY_HPP
+
+#include "msgpack/adaptor/size_equal_only_decl.hpp"
+
+#include "msgpack/v1/adaptor/size_equal_only.hpp"
+
+#endif // MSGPACK_TYPE_SIZE_EQUAL_ONLYL_HPP

data/vendor/local/include/msgpack/adaptor/size_equal_only_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_SIZE_EQUAL_ONLY_DECL_HPP
+#define MSGPACK_TYPE_SIZE_EQUAL_ONLY_DECL_HPP
+
+#include "msgpack/v1/adaptor/size_equal_only_decl.hpp"
+#include "msgpack/v2/adaptor/size_equal_only_decl.hpp"
+
+#endif // MSGPACK_TYPE_SIZE_EQUAL_ONLY_DECL_HPP

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

@@ -1,7 +1,7 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2008-2015 FURUHASHI Sadayuki
+// Copyright (C) 2016 KONDO Takatoshi
 //
 //    Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,77 +10,6 @@
 #ifndef MSGPACK_TYPE_STRING_HPP
 #define MSGPACK_TYPE_STRING_HPP
 
-#include "msgpack/versioning.hpp"
-#include "msgpack/adaptor/adaptor_base.hpp"
-#include "msgpack/adaptor/check_container_size.hpp"
-
-#include <string>
-
-namespace msgpack {
-
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-namespace adaptor {
-
-template <>
-struct convert<std::string> {
-    msgpack::object const& operator()(msgpack::object const& o, std::string& v) const {
-        switch (o.type) {
-        case msgpack::type::BIN:
-            v.assign(o.via.bin.ptr, o.via.bin.size);
-            break;
-        case msgpack::type::STR:
-            v.assign(o.via.str.ptr, o.via.str.size);
-            break;
-        default:
-            throw msgpack::type_error();
-            break;
-        }
-        return o;
-    }
-};
-
-template <>
-struct pack<std::string> {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::string& v) const {
-        uint32_t size = checked_get_container_size(v.size());
-        o.pack_str(size);
-        o.pack_str_body(v.data(), size);
-        return o;
-    }
-};
-
-template <>
-struct object<std::string> {
-    void operator()(msgpack::object& o, const std::string& v) const {
-        uint32_t size = checked_get_container_size(v.size());
-        o.type = msgpack::type::STR;
-        o.via.str.ptr = v.data();
-        o.via.str.size = size;
-    }
-};
-
-template <>
-struct object_with_zone<std::string> {
-    void operator()(msgpack::object::with_zone& o, const std::string& v) const {
-        uint32_t size = checked_get_container_size(v.size());
-        o.type = msgpack::type::STR;
-        char* ptr = static_cast<char*>(o.zone.allocate_align(size));
-        o.via.str.ptr = ptr;
-        o.via.str.size = size;
-        std::memcpy(ptr, v.data(), v.size());
-    }
-};
-
-} // namespace adaptor
-
-/// @cond
-}  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-}  // namespace msgpack
+#include "msgpack/v1/adaptor/string.hpp"
 
 #endif // MSGPACK_TYPE_STRING_HPP

data/vendor/local/include/msgpack/adaptor/tr1/unordered_map.hpp

@@ -80,7 +80,7 @@ struct object_with_zone<MSGPACK_STD_TR1::unordered_map<K, V, Hash, Pred, Alloc>
     void operator()(msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_map<K, V, Hash, Pred, Alloc>& v) const {
         o.type = msgpack::type::MAP;
         if(v.empty()) {
-            o.via.map.ptr  = nullptr;
+            o.via.map.ptr  = MSGPACK_NULLPTR;
             o.via.map.size = 0;
         } else {
             uint32_t size = checked_get_container_size(v.size());
@@ -137,7 +137,7 @@ struct object_with_zone<MSGPACK_STD_TR1::unordered_multimap<K, V, Hash, Pred, Al
     void operator()(msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_multimap<K, V, Hash, Pred, Alloc>& v) const {
         o.type = msgpack::type::MAP;
         if(v.empty()) {
-            o.via.map.ptr  = nullptr;
+            o.via.map.ptr  = MSGPACK_NULLPTR;
             o.via.map.size = 0;
         } else {
             uint32_t size = checked_get_container_size(v.size());

data/vendor/local/include/msgpack/adaptor/tr1/unordered_set.hpp

@@ -78,7 +78,7 @@ struct object_with_zone<MSGPACK_STD_TR1::unordered_set<T, Hash, Compare, Alloc>
     void operator()(msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_set<T, Hash, Compare, Alloc>& v) const {
         o.type = msgpack::type::ARRAY;
         if(v.empty()) {
-            o.via.array.ptr = nullptr;
+            o.via.array.ptr = MSGPACK_NULLPTR;
             o.via.array.size = 0;
         } else {
             uint32_t size = checked_get_container_size(v.size());
@@ -132,7 +132,7 @@ struct object_with_zone<MSGPACK_STD_TR1::unordered_multiset<T, Hash, Compare, Al
     void operator()(msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_multiset<T, Hash, Compare, Alloc>& v) const {
         o.type = msgpack::type::ARRAY;
         if(v.empty()) {
-            o.via.array.ptr = nullptr;
+            o.via.array.ptr = MSGPACK_NULLPTR;
             o.via.array.size = 0;
         } else {
             uint32_t size = checked_get_container_size(v.size());

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

@@ -1,7 +1,7 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2008-2015 FURUHASHI Sadayuki and KONDO Takatoshi
+// Copyright (C) 2008-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,97 +10,8 @@
 #ifndef MSGPACK_TYPE_V4RAW_HPP
 #define MSGPACK_TYPE_V4RAW_HPP
 
-#include "msgpack/versioning.hpp"
-#include "msgpack/adaptor/adaptor_base.hpp"
-#include <cstring>
-#include <string>
+#include "msgpack/adaptor/v4raw_decl.hpp"
 
-namespace msgpack {
-
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-namespace type {
-
-struct v4raw_ref {
-    v4raw_ref() : size(0), ptr(nullptr) {}
-    v4raw_ref(const char* p, uint32_t s) : size(s), ptr(p) {}
-
-    uint32_t size;
-    const char* ptr;
-
-    std::string str() const { return std::string(ptr, size); }
-
-    bool operator== (const v4raw_ref& x) const
-    {
-        return size == x.size && std::memcmp(ptr, x.ptr, size) == 0;
-    }
-
-    bool operator!= (const v4raw_ref& x) const
-    {
-        return !(*this == x);
-    }
-
-    bool operator< (const v4raw_ref& x) const
-    {
-        if(size == x.size) { return std::memcmp(ptr, x.ptr, size) < 0; }
-        else { return size < x.size; }
-    }
-
-    bool operator> (const v4raw_ref& x) const
-    {
-        if(size == x.size) { return std::memcmp(ptr, x.ptr, size) > 0; }
-        else { return size > x.size; }
-    }
-};
-
-} // namespace type
-
-namespace adaptor {
-
-template <>
-struct convert<msgpack::type::v4raw_ref> {
-    msgpack::object const& operator()(msgpack::object const& o, msgpack::type::v4raw_ref& v) const {
-        if(o.type != msgpack::type::STR) { throw msgpack::type_error(); }
-        v.ptr  = o.via.str.ptr;
-        v.size = o.via.str.size;
-        return o;
-    }
-};
-
-template <>
-struct pack<msgpack::type::v4raw_ref> {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const msgpack::type::v4raw_ref& v) const {
-        o.pack_v4raw(v.size);
-        o.pack_v4raw_body(v.ptr, v.size);
-        return o;
-    }
-};
-
-template <>
-struct object<msgpack::type::v4raw_ref> {
-    void operator()(msgpack::object& o, const msgpack::type::v4raw_ref& v) const {
-        o.type = msgpack::type::STR;
-        o.via.str.ptr = v.ptr;
-        o.via.str.size = v.size;
-    }
-};
-
-template <>
-struct object_with_zone<msgpack::type::v4raw_ref> {
-    void operator()(msgpack::object::with_zone& o, const msgpack::type::v4raw_ref& v) const {
-        static_cast<msgpack::object&>(o) << v;
-    }
-};
-
-} // namespace adaptor
-
-/// @cond
-} // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-} // namespace msgpack
+#include "msgpack/v1/adaptor/v4raw.hpp"
 
 #endif // MSGPACK_TYPE_V4RAW_HPP

data/vendor/local/include/msgpack/adaptor/v4raw_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_V4RAW_DECL_HPP
+#define MSGPACK_TYPE_V4RAW_DECL_HPP
+
+#include "msgpack/v1/adaptor/v4raw_decl.hpp"
+#include "msgpack/v2/adaptor/v4raw_decl.hpp"
+
+#endif // MSGPACK_TYPE_V4RAW_DECL_HPP

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

@@ -1,7 +1,7 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2008-2015 FURUHASHI Sadayuki and KONDO Takatoshi
+// Copyright (C) 2016 KONDO Takatoshi
 //
 //    Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,112 +10,6 @@
 #ifndef MSGPACK_TYPE_VECTOR_HPP
 #define MSGPACK_TYPE_VECTOR_HPP
 
-#include "msgpack/versioning.hpp"
-#include "msgpack/adaptor/adaptor_base.hpp"
-#include "msgpack/adaptor/check_container_size.hpp"
-
-#include <vector>
-
-namespace msgpack {
-
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-namespace adaptor {
-
-#if !defined(MSGPACK_USE_CPP03)
-
-template <typename T, typename Alloc>
-struct as<std::vector<T, Alloc>, typename std::enable_if<msgpack::has_as<T>::value>::type> {
-    std::vector<T, Alloc> operator()(const msgpack::object& o) const {
-        if (o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
-        std::vector<T, Alloc> v;
-        v.reserve(o.via.array.size);
-        if (o.via.array.size > 0) {
-            msgpack::object* p = o.via.array.ptr;
-            msgpack::object* const pend = o.via.array.ptr + o.via.array.size;
-            do {
-                v.push_back(p->as<T>());
-                ++p;
-            } while (p < pend);
-        }
-        return v;
-    }
-};
-
-#endif // !defined(MSGPACK_USE_CPP03)
-
-template <typename T, typename Alloc>
-struct convert<std::vector<T, Alloc> > {
-    msgpack::object const& operator()(msgpack::object const& o, std::vector<T, Alloc>& v) const {
-        if (o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
-        v.resize(o.via.array.size);
-        if (o.via.array.size > 0) {
-            msgpack::object* p = o.via.array.ptr;
-            msgpack::object* const pend = o.via.array.ptr + o.via.array.size;
-            typename std::vector<T, Alloc>::iterator it = v.begin();
-            do {
-                p->convert(*it);
-                ++p;
-                ++it;
-            } while(p < pend);
-        }
-        return o;
-    }
-};
-
-template <typename T, typename Alloc>
-struct pack<std::vector<T, Alloc> > {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::vector<T, Alloc>& v) const {
-        uint32_t size = checked_get_container_size(v.size());
-        o.pack_array(size);
-        for (typename std::vector<T, Alloc>::const_iterator it(v.begin()), it_end(v.end());
-            it != it_end; ++it) {
-            o.pack(*it);
-        }
-        return o;
-    }
-};
-
-template <typename T, typename Alloc>
-struct object_with_zone<std::vector<T, Alloc> > {
-    void operator()(msgpack::object::with_zone& o, const std::vector<T, Alloc>& v) const {
-        o.type = msgpack::type::ARRAY;
-        if (v.empty()) {
-            o.via.array.ptr = nullptr;
-            o.via.array.size = 0;
-        }
-        else {
-            uint32_t size = checked_get_container_size(v.size());
-            msgpack::object* p = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*size));
-            msgpack::object* const pend = p + size;
-            o.via.array.ptr = p;
-            o.via.array.size = size;
-            typename std::vector<T, Alloc>::const_iterator it(v.begin());
-            do {
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
-                *p = msgpack::object(*it, o.zone);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
-                ++p;
-                ++it;
-            } while(p < pend);
-        }
-    }
-};
-
-} // namespace adaptor
-
-/// @cond
-} // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-} // namespace msgpack
+#include "msgpack/v1/adaptor/vector.hpp"
 
 #endif // MSGPACK_TYPE_VECTOR_HPP

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

@@ -1,7 +1,7 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2015 KONDO Takatoshi
+// Copyright (C) 2016 KONDO Takatoshi
 //
 //    Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,79 +10,6 @@
 #ifndef MSGPACK_TYPE_VECTOR_BOOL_HPP
 #define MSGPACK_TYPE_VECTOR_BOOL_HPP
 
-#include "msgpack/versioning.hpp"
-#include "msgpack/object_fwd.hpp"
-#include <vector>
-
-namespace msgpack {
-
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-namespace adaptor {
-
-template <typename Alloc>
-struct convert<std::vector<bool, Alloc> > {
-    msgpack::object const& operator()(msgpack::object const& o, std::vector<bool, Alloc>& v) const {
-        if (o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
-        if (o.via.array.size > 0) {
-            v.resize(o.via.array.size);
-            msgpack::object* p = o.via.array.ptr;
-            for (typename std::vector<bool, Alloc>::iterator it = v.begin(), end = v.end();
-                 it != end;
-                 ++it) {
-                *it = p->as<bool>();
-                ++p;
-            }
-        }
-        return o;
-    }
-};
-
-template <typename Alloc>
-struct pack<std::vector<bool, Alloc> > {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::vector<bool, Alloc>& v) const {
-        uint32_t size = checked_get_container_size(v.size());
-        o.pack_array(size);
-        for(typename std::vector<bool, Alloc>::const_iterator it(v.begin()), it_end(v.end());
-            it != it_end; ++it) {
-            o.pack(static_cast<bool>(*it));
-        }
-        return o;
-    }
-};
-
-template <typename Alloc>
-struct object_with_zone<std::vector<bool, Alloc> > {
-    void operator()(msgpack::object::with_zone& o, const std::vector<bool, Alloc>& v) const {
-        o.type = msgpack::type::ARRAY;
-        if(v.empty()) {
-            o.via.array.ptr = nullptr;
-            o.via.array.size = 0;
-        } else {
-            uint32_t size = checked_get_container_size(v.size());
-            msgpack::object* p = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*size));
-            msgpack::object* const pend = p + size;
-            o.via.array.ptr = p;
-            o.via.array.size = size;
-            typename std::vector<bool, Alloc>::const_iterator it(v.begin());
-            do {
-                *p = msgpack::object(static_cast<bool>(*it), o.zone);
-                ++p;
-                ++it;
-            } while(p < pend);
-        }
-    }
-};
-
-} // namespace adaptor
-
-/// @cond
-}  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-}  // namespace msgpack
+#include "msgpack/v1/adaptor/vector_bool.hpp"
 
 #endif // MSGPACK_TYPE_VECTOR_BOOL_HPP