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

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

@@ -1,7 +1,7 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2014-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,80 +10,6 @@
 #ifndef MSGPACK_TYPE_VECTOR_CHAR_HPP
 #define MSGPACK_TYPE_VECTOR_CHAR_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 {
-
-template <typename Alloc>
-struct convert<std::vector<char, Alloc> > {
-    msgpack::object const& operator()(msgpack::object const& o, std::vector<char, Alloc>& v) const {
-        switch (o.type) {
-        case msgpack::type::BIN:
-            v.resize(o.via.bin.size);
-            std::memcpy(&v.front(), o.via.bin.ptr, o.via.bin.size);
-            break;
-        case msgpack::type::STR:
-            v.resize(o.via.str.size);
-            std::memcpy(&v.front(), o.via.str.ptr, o.via.str.size);
-            break;
-        default:
-            throw msgpack::type_error();
-            break;
-        }
-        return o;
-    }
-};
-
-template <typename Alloc>
-struct pack<std::vector<char, Alloc> > {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::vector<char, Alloc>& v) const {
-        uint32_t size = checked_get_container_size(v.size());
-        o.pack_bin(size);
-        o.pack_bin_body(&v.front(), size);
-
-        return o;
-    }
-};
-
-template <typename Alloc>
-struct object<std::vector<char, Alloc> > {
-    void operator()(msgpack::object& o, const std::vector<char, Alloc>& v) const {
-        uint32_t size = checked_get_container_size(v.size());
-        o.type = msgpack::type::BIN;
-        o.via.bin.ptr = &v.front();
-        o.via.bin.size = size;
-    }
-};
-
-template <typename Alloc>
-struct object_with_zone<std::vector<char, Alloc> > {
-    void operator()(msgpack::object::with_zone& o, const std::vector<char, Alloc>& v) const {
-        uint32_t size = checked_get_container_size(v.size());
-        o.type = msgpack::type::BIN;
-        char* ptr = static_cast<char*>(o.zone.allocate_align(size));
-        o.via.bin.ptr = ptr;
-        o.via.bin.size = size;
-        std::memcpy(ptr, &v.front(), size);
-    }
-};
-
-} // namespace adaptor
-
-/// @cond
-} // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-} // namespace msgpack
+#include "msgpack/v1/adaptor/vector_char.hpp"
 
 #endif // MSGPACK_TYPE_VECTOR_CHAR_HPP

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

@@ -1,7 +1,7 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2014-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,80 +10,6 @@
 #ifndef MSGPACK_TYPE_VECTOR_UNSIGNED_CHAR_HPP
 #define MSGPACK_TYPE_VECTOR_UNSIGNED_CHAR_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 {
-
-template <typename Alloc>
-struct convert<std::vector<unsigned char, Alloc> > {
-    msgpack::object const& operator()(msgpack::object const& o, std::vector<unsigned char, Alloc>& v) const {
-        switch (o.type) {
-        case msgpack::type::BIN:
-            v.resize(o.via.bin.size);
-            std::memcpy(&v.front(), o.via.bin.ptr, o.via.bin.size);
-            break;
-        case msgpack::type::STR:
-            v.resize(o.via.str.size);
-            std::memcpy(&v.front(), o.via.str.ptr, o.via.str.size);
-            break;
-        default:
-            throw msgpack::type_error();
-            break;
-        }
-        return o;
-    }
-};
-
-template <typename Alloc>
-struct pack<std::vector<unsigned char, Alloc> > {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const std::vector<unsigned char, Alloc>& v) const {
-        uint32_t size = checked_get_container_size(v.size());
-        o.pack_bin(size);
-        o.pack_bin_body(reinterpret_cast<char const*>(&v.front()), size);
-
-        return o;
-    }
-};
-
-template <typename Alloc>
-struct object<std::vector<unsigned char, Alloc> > {
-    void operator()(msgpack::object& o, const std::vector<unsigned char, Alloc>& v) const {
-        uint32_t size = checked_get_container_size(v.size());
-        o.type = msgpack::type::BIN;
-        o.via.bin.ptr = reinterpret_cast<char const*>(&v.front());
-        o.via.bin.size = size;
-    }
-};
-
-template <typename Alloc>
-struct object_with_zone<std::vector<unsigned char, Alloc> > {
-    void operator()(msgpack::object::with_zone& o, const std::vector<unsigned char, Alloc>& v) const {
-        uint32_t size = checked_get_container_size(v.size());
-        o.type = msgpack::type::BIN;
-        char* ptr = static_cast<char*>(o.zone.allocate_align(size));
-        o.via.bin.ptr = ptr;
-        o.via.bin.size = size;
-        std::memcpy(ptr, &v.front(), size);
-    }
-};
-
-} // namespace adaptor
-
-/// @cond
-} // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-} // namespace msgpack
+#include "msgpack/v1/adaptor/vector_unsigned_char.hpp"
 
 #endif // MSGPACK_TYPE_VECTOR_UNSIGNED_CHAR_HPP

data/vendor/local/include/msgpack/cpp_config.hpp

@@ -1,7 +1,7 @@
 //
 // MessagePack for C++ C++03/C++11 Adaptation
 //
-// Copyright (C) 2013 KONDO Takatoshi
+// Copyright (C) 2013-2016 KONDO Takatoshi
 //
 //    Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,115 +10,8 @@
 #ifndef MSGPACK_CPP_CONFIG_HPP
 #define MSGPACK_CPP_CONFIG_HPP
 
-#include "msgpack/versioning.hpp"
+#include "msgpack/cpp_config_decl.hpp"
 
-#if !defined(MSGPACK_USE_CPP03)
-# if defined(_MSC_VER)
-#  if _MSC_VER < 1900
-#    define MSGPACK_USE_CPP03
-#  endif
-# elif (__cplusplus < 201103L)
-#  define MSGPACK_USE_CPP03
-# endif
-#endif // MSGPACK_USE_CPP03
+#include "msgpack/v1/cpp_config.hpp"
 
-
-
-#if defined(MSGPACK_USE_CPP03)
-
-#if !defined(nullptr)
-#  if _MSC_VER < 1600
-#    define nullptr (0)
-#  endif
-#endif
-
-#include <memory>
-
-namespace msgpack {
-
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-template <typename T>
-struct unique_ptr : std::auto_ptr<T> {
-    explicit unique_ptr(T* p = 0) throw() : std::auto_ptr<T>(p) {}
-    unique_ptr(unique_ptr& a) throw() : std::auto_ptr<T>(a) {}
-    template<class Y>
-    unique_ptr (unique_ptr<Y>& a) throw() : std::auto_ptr<T>(a) {}
-};
-
-template <typename T>
-T& move(T& t)
-{
-    return t;
-}
-
-template <typename T>
-T const& move(T const& t)
-{
-    return t;
-}
-
-template <bool P, typename T = void>
-struct enable_if {
-    typedef T type;
-};
-
-template <typename T>
-struct enable_if<false, T> {
-};
-
-template<typename T, T val>
-struct integral_constant {
-    static T const value = val;
-    typedef T value_type;
-    typedef integral_constant<T, val> type;
-};
-
-typedef integral_constant<bool, true> true_type;
-typedef integral_constant<bool, false> false_type;
-
-template<class T, class U>
-struct is_same : false_type {};
-
-template<class T>
-struct is_same<T, T> : true_type {};
-
-/// @cond
-}  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-}  // namespace msgpack
-
-
-#else  // MSGPACK_USE_CPP03
-
-#include <memory>
-#include <tuple>
-
-namespace msgpack {
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-    // unique_ptr
-    using std::unique_ptr;
-    // using std::make_unique; // since C++14
-    using std::hash;
-
-    // utility
-    using std::move;
-    using std::swap;
-    using std::enable_if;
-    using std::is_same;
-
-/// @cond
-}  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-}  // namespace msgpack
-
-
-#endif // MSGPACK_USE_CPP03
-
-#endif /* msgpack/cpp_config.hpp */
+#endif // MSGPACK_CPP_CONFIG_HPP

data/vendor/local/include/msgpack/cpp_config_decl.hpp

@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ C++03/C++11 Adaptation
+//
+// 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_CPP_CONFIG_DECL_HPP
+#define MSGPACK_CPP_CONFIG_DECL_HPP
+
+#include "msgpack/v1/cpp_config_decl.hpp"
+#include "msgpack/v2/cpp_config_decl.hpp"
+
+#endif // MSGPACK_CPP_CONFIG_DECL_HPP

data/vendor/local/include/msgpack/fbuffer.h

@@ -23,7 +23,7 @@ extern "C" {
  * @{
  */
 
-static inline int msgpack_fbuffer_write(void* data, const char* buf, unsigned int len)
+static inline int msgpack_fbuffer_write(void* data, const char* buf, size_t len)
 {
     return (1 == fwrite(buf, len, 1, (FILE *)data)) ? 0 : -1;
 }

data/vendor/local/include/msgpack/fbuffer.hpp

@@ -7,54 +7,11 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //    http://www.boost.org/LICENSE_1_0.txt)
 //
-#ifndef MSGPACK_FBUFFER_HPP__
-#define MSGPACK_FBUFFER_HPP__
+#ifndef MSGPACK_FBUFFER_HPP
+#define MSGPACK_FBUFFER_HPP
 
-#include "msgpack/versioning.hpp"
+#include "msgpack/fbuffer_decl.hpp"
 
-#include <cstdio>
-#include <stdexcept>
+#include "msgpack/v1/fbuffer.hpp"
 
-namespace msgpack {
-
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-class fbuffer {
-public:
-    explicit fbuffer(FILE* file) : m_file(file) { }
-
-public:
-    void write(const char* buf, unsigned int len)
-    {
-        if (1 != fwrite(buf, len, 1, m_file)) {
-            throw std::runtime_error("fwrite() failed");
-        }
-    }
-
-    FILE* file() const
-    {
-        return m_file;
-    }
-
-#if defined(MSGPACK_USE_CPP03)
-private:
-    fbuffer(const fbuffer&);
-    fbuffer& operator=(const fbuffer&);
-#else  // defined(MSGPACK_USE_CPP03)
-    fbuffer(const fbuffer&) = delete;
-    fbuffer& operator=(const fbuffer&) = delete;
-#endif // defined(MSGPACK_USE_CPP03)
-
-private:
-    FILE* m_file;
-};
-
-/// @cond
-}  // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-}  // namespace msgpack
-
-#endif /* msgpack/fbuffer.hpp */
+#endif // MSGPACK_FBUFFER_HPP

data/vendor/local/include/msgpack/fbuffer_decl.hpp

@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ FILE* buffer adaptor
+//
+// 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_FBUFFER_DECL_HPP
+#define MSGPACK_FBUFFER_DECL_HPP
+
+#include "msgpack/v1/fbuffer_decl.hpp"
+#include "msgpack/v2/fbuffer_decl.hpp"
+
+#endif // MSGPACK_FBUFFER_DECL_HPP

data/vendor/local/include/msgpack/gcc_atomic.hpp

@@ -0,0 +1,33 @@
+//
+// MessagePack for C++ old gcc workaround for atomic operation
+//
+// Copyright (C) 2008-2013 FURUHASHI Sadayuki and 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_GCC_ATOMIC_HPP
+#define MSGPACK_GCC_ATOMIC_HPP
+
+#ifdef ENABLE_GCC_CXX_ATOMIC
+#if defined(__GNUC__) && ((__GNUC__*10 + __GNUC_MINOR__) < 41)
+
+#include "msgpack/gcc_atomic.h"
+#include <bits/atomicity.h>
+
+int _msgpack_sync_decr_and_fetch(volatile _msgpack_atomic_counter_t* ptr)
+{
+    return  __gnu_cxx::__exchange_and_add(ptr, -1) - 1;
+}
+
+int _msgpack_sync_incr_and_fetch(volatile _msgpack_atomic_counter_t* ptr)
+{
+    return  __gnu_cxx::__exchange_and_add(ptr, 1) + 1;
+}
+
+#endif // old gcc workaround
+#endif // ENABLE_GCC_CXX_ATOMIC
+
+#endif /* gcc_atomic.hpp */