rroonga 5.1.1-x86-mingw32 → 6.0.0-x86-mingw32

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

@@ -3,17 +3,9 @@
 //
 // Copyright (C) 2008-2014 FURUHASHI Sadayuki and KONDO Takatoshi
 //
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-//
-//        http://www.apache.org/licenses/LICENSE-2.0
-//
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
+//    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_OBJECT_FWD_HPP
@@ -27,7 +19,9 @@
 
 namespace msgpack {
 
+/// @cond
 MSGPACK_API_VERSION_NAMESPACE(v1) {
+/// @endcond
 
 
 namespace type {
@@ -79,6 +73,33 @@ struct object_ext {
     const char* ptr;
 };
 
+
+#if !defined(MSGPACK_USE_CPP03)
+struct object;
+
+namespace adaptor {
+template <typename T, typename Enabler = void>
+struct as;
+} // namespace adaptor
+
+template <typename T>
+struct has_as {
+private:
+    template <typename U>
+    static auto check(U*) ->
+        typename std::is_same<
+            decltype(msgpack::adaptor::as<U>()(std::declval<msgpack::object>())),
+            T>::type;
+    template <typename>
+    static std::false_type check(...);
+public:
+    using type = decltype(check<T>(nullptr));
+    static constexpr bool value = type::value;
+};
+
+#endif // !defined(MSGPACK_USE_CPP03)
+
+
 struct object {
     union union_type {
         bool boolean;
@@ -100,13 +121,28 @@ struct object {
 
     bool is_nil() const { return type == msgpack::type::NIL; }
 
+#if defined(MSGPACK_USE_CPP03)
+
     template <typename T>
     T as() const;
 
+#else  // defined(MSGPACK_USE_CPP03)
+
     template <typename T>
-    void convert(T& v) const;
+    typename std::enable_if<msgpack::has_as<T>::value, T>::type as() const;
+
     template <typename T>
-    void convert(T* v) const;
+    typename std::enable_if<!msgpack::has_as<T>::value, T>::type as() const;
+
+#endif // defined(MSGPACK_USE_CPP03)
+
+    template <typename T>
+    T& convert(T& v) const;
+    template <typename T>
+    T* convert(T* v) const;
+
+    template <typename T>
+    bool convert_if_not_nil(T& v) const;
 
     object();
 
@@ -143,39 +179,16 @@ struct object_kv {
     msgpack::object val;
 };
 
-namespace detail {
-template <typename Stream, typename T>
-struct packer_serializer;
-} // namespace detail
-
-msgpack::object const& operator>> (msgpack::object const& o, msgpack::object& v);
-
-template <typename T>
-msgpack::object const& operator>> (msgpack::object const& o, T& v);
-
-template <typename T>
-void operator<< (msgpack::object::with_zone& o, const T& v);
-
-void operator<< (msgpack::object::with_zone& o, const msgpack::object& v);
-
-void operator<< (msgpack::object::with_zone& o, const msgpack::object::with_zone& v);
-
-template <typename Stream>
-class packer;
-
-template <typename Stream>
-msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const msgpack::object& v);
-
-template <typename Stream>
-msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const msgpack::object::with_zone& v);
-
-template <typename Stream, typename T>
-msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const T& v);
-
-template <typename T>
-void operator<< (msgpack::object::with_zone& o, const T& v);
+struct object::with_zone : object {
+    with_zone(msgpack::zone& zone) : zone(zone) { }
+    msgpack::zone& zone;
+private:
+    with_zone();
+};
 
+/// @cond
 } // MSGPACK_API_VERSION_NAMESPACE(v1)
+/// @endcond
 
 } // namespace msgpack
 

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

@@ -3,17 +3,9 @@
  *
  * Copyright (C) 2008-2009 FURUHASHI Sadayuki
  *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ *    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_PACK_H
 #define MSGPACK_PACK_H
@@ -97,6 +89,9 @@ static int msgpack_pack_map(msgpack_packer* pk, size_t n);
 static int msgpack_pack_str(msgpack_packer* pk, size_t l);
 static int msgpack_pack_str_body(msgpack_packer* pk, const void* b, size_t l);
 
+static int msgpack_pack_v4raw(msgpack_packer* pk, size_t l);
+static int msgpack_pack_v4raw_body(msgpack_packer* pk, const void* b, size_t l);
+
 static int msgpack_pack_bin(msgpack_packer* pk, size_t l);
 static int msgpack_pack_bin_body(msgpack_packer* pk, const void* b, size_t l);
 
@@ -150,4 +145,3 @@ inline void msgpack_packer_free(msgpack_packer* pk)
 #endif
 
 #endif /* msgpack/pack.h */
-

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

@@ -3,22 +3,15 @@
 //
 // Copyright (C) 2008-2013 FURUHASHI Sadayuki and KONDO Takatoshi
 //
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-//
-//        http://www.apache.org/licenses/LICENSE-2.0
-//
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
+//    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_PACK_HPP
 #define MSGPACK_PACK_HPP
 
 #include "msgpack/versioning.hpp"
+#include "msgpack/cpp_config.hpp"
 
 #include <stdexcept>
 #include <limits>
@@ -29,7 +22,9 @@
 
 namespace msgpack {
 
+/// @cond
 MSGPACK_API_VERSION_NAMESPACE(v1) {
+/// @endcond
 
 template <typename Stream>
 class packer {
@@ -80,16 +75,20 @@ public:
 
     packer<Stream>& pack_array(uint32_t n);
 
-	packer<Stream>& pack_map(uint32_t n);
+    packer<Stream>& pack_map(uint32_t n);
+
+    packer<Stream>& pack_str(uint32_t l);
+    packer<Stream>& pack_str_body(const char* b, uint32_t l);
 
-	packer<Stream>& pack_str(uint32_t l);
-	packer<Stream>& pack_str_body(const char* b, uint32_t l);
+    // v4
+    packer<Stream>& pack_v4raw(uint32_t l);
+    packer<Stream>& pack_v4raw_body(const char* b, uint32_t l);
 
-	packer<Stream>& pack_bin(uint32_t l);
-	packer<Stream>& pack_bin_body(const char* b, uint32_t l);
+    packer<Stream>& pack_bin(uint32_t l);
+    packer<Stream>& pack_bin_body(const char* b, uint32_t l);
 
     packer<Stream>& pack_ext(size_t l, int8_t type);
-	packer<Stream>& pack_ext_body(const char* b, uint32_t l);
+    packer<Stream>& pack_ext_body(const char* b, uint32_t l);
 
 private:
     template <typename T>
@@ -119,11 +118,13 @@ private:
 private:
     packer(const packer&);
     packer& operator=(const packer&);
+    packer();
 #else  // defined(MSGPACK_USE_CPP03)
+public:
     packer(const packer&) = delete;
     packer& operator=(const packer&) = delete;
+    packer() = delete;
 #endif // defined(MSGPACK_USE_CPP03)
-    packer();
 };
 
 
@@ -139,16 +140,8 @@ inline void pack(Stream& s, const T& v)
     packer<Stream>(s).pack(v);
 }
 
-// serialize operator
-template <typename Stream, typename T>
-inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const T& v)
-{
-    return detail::packer_serializer<Stream, T>::pack(o, v);
-}
-
 
-
-#if defined(__LITTLE_ENDIAN__)
+#if MSGPACK_ENDIAN_LITTLE_BYTE
 template <typename T>
 inline char take8_8(T d) {
     return static_cast<char>(reinterpret_cast<uint8_t*>(&d)[0]);
@@ -166,7 +159,7 @@ inline char take8_64(T d) {
     return static_cast<char>(reinterpret_cast<uint8_t*>(&d)[0]);
 }
 
-#elif defined(__BIG_ENDIAN__)
+#elif MSGPACK_ENDIAN_BIG_BYTE
 
 template <typename T>
 inline char take8_8(T d) {
@@ -185,6 +178,8 @@ inline char take8_64(T d) {
     return static_cast<char>(reinterpret_cast<uint8_t*>(&d)[7]);
 }
 
+#else
+#error msgpack-c supports only big endian and little endian
 #endif
 
 template <typename Stream>
@@ -611,7 +606,10 @@ inline packer<Stream>& packer<Stream>::pack_double(double d)
     mem.f = d;
     char buf[9];
     buf[0] = static_cast<char>(0xcbu);
-#if defined(__arm__) && !(__ARM_EABI__) // arm-oabi
+
+#if defined(TARGET_OS_IPHONE)
+    // ok
+#elif defined(__arm__) && !(__ARM_EABI__) // arm-oabi
     // https://github.com/msgpack/msgpack-perl/pull/1
     mem.i = (mem.i & 0xFFFFFFFFUL) << 32UL | (mem.i >> 32UL);
 #endif
@@ -687,7 +685,7 @@ template <typename Stream>
 inline packer<Stream>& packer<Stream>::pack_str(uint32_t l)
 {
     if(l < 32) {
-        unsigned char d = 0xa0u | static_cast<uint8_t>(l);
+        unsigned char d = static_cast<uint8_t>(0xa0u | l);
         char buf = take8_8(d);
         append_buffer(&buf, 1);
     } else if(l < 256) {
@@ -713,6 +711,34 @@ inline packer<Stream>& packer<Stream>::pack_str_body(const char* b, uint32_t l)
     return *this;
 }
 
+// Raw (V4)
+
+template <typename Stream>
+inline packer<Stream>& packer<Stream>::pack_v4raw(uint32_t l)
+{
+    if(l < 32) {
+        unsigned char d = static_cast<uint8_t>(0xa0u | l);
+        char buf = take8_8(d);
+        append_buffer(&buf, 1);
+    } else if(l < 65536) {
+        char buf[3];
+        buf[0] = static_cast<char>(0xdau); _msgpack_store16(&buf[1], static_cast<uint16_t>(l));
+        append_buffer(buf, 3);
+    } else {
+        char buf[5];
+        buf[0] = static_cast<char>(0xdbu); _msgpack_store32(&buf[1], static_cast<uint32_t>(l));
+        append_buffer(buf, 5);
+    }
+    return *this;
+}
+
+template <typename Stream>
+inline packer<Stream>& packer<Stream>::pack_v4raw_body(const char* b, uint32_t l)
+{
+    append_buffer(b, l);
+    return *this;
+}
+
 template <typename Stream>
 inline packer<Stream>& packer<Stream>::pack_bin(uint32_t l)
 {
@@ -1055,7 +1081,9 @@ inline void packer<Stream>::pack_imp_int64(T d)
     }
 }
 
+/// @cond
 }  // MSGPACK_API_VERSION_NAMESPACE(v1)
+/// @endcond
 
 }  // namespace msgpack
 

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

@@ -3,17 +3,9 @@
  *
  * Copyright (C) 2008-2010 FURUHASHI Sadayuki
  *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ *    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_PACK_DEFINE_H
 #define MSGPACK_PACK_DEFINE_H

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

@@ -3,29 +3,23 @@
  *
  * Copyright (C) 2008-2010 FURUHASHI Sadayuki
  *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ *    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)
  */
 
-#if defined(__LITTLE_ENDIAN__)
+#if MSGPACK_ENDIAN_LITTLE_BYTE
 #define TAKE8_8(d)  ((uint8_t*)&d)[0]
 #define TAKE8_16(d) ((uint8_t*)&d)[0]
 #define TAKE8_32(d) ((uint8_t*)&d)[0]
 #define TAKE8_64(d) ((uint8_t*)&d)[0]
-#elif defined(__BIG_ENDIAN__)
+#elif MSGPACK_ENDIAN_BIG_BYTE
 #define TAKE8_8(d)  ((uint8_t*)&d)[0]
 #define TAKE8_16(d) ((uint8_t*)&d)[1]
 #define TAKE8_32(d) ((uint8_t*)&d)[3]
 #define TAKE8_64(d) ((uint8_t*)&d)[7]
+#else
+#error msgpack-c supports only big endian and little endian
 #endif
 
 #ifndef msgpack_pack_inline_func
@@ -669,7 +663,9 @@ msgpack_pack_inline_func(_double)(msgpack_pack_user x, double d)
     union { double f; uint64_t i; } mem;
     mem.f = d;
     buf[0] = 0xcb;
-#if defined(__arm__) && !(__ARM_EABI__) // arm-oabi
+#if defined(TARGET_OS_IPHONE)
+    // ok
+#elif defined(__arm__) && !(__ARM_EABI__) // arm-oabi
     // https://github.com/msgpack/msgpack-perl/pull/1
     mem.i = (mem.i & 0xFFFFFFFFUL) << 32UL | (mem.i >> 32UL);
 #endif
@@ -777,6 +773,31 @@ msgpack_pack_inline_func(_str_body)(msgpack_pack_user x, const void* b, size_t l
     msgpack_pack_append_buffer(x, (const unsigned char*)b, l);
 }
 
+/*
+ * Raw (V4)
+ */
+
+msgpack_pack_inline_func(_v4raw)(msgpack_pack_user x, size_t l)
+{
+    if(l < 32) {
+        unsigned char d = 0xa0 | (uint8_t)l;
+        msgpack_pack_append_buffer(x, &TAKE8_8(d), 1);
+    } else if(l < 65536) {
+        unsigned char buf[3];
+        buf[0] = 0xda; _msgpack_store16(&buf[1], (uint16_t)l);
+        msgpack_pack_append_buffer(x, buf, 3);
+    } else {
+        unsigned char buf[5];
+        buf[0] = 0xdb; _msgpack_store32(&buf[1], (uint32_t)l);
+        msgpack_pack_append_buffer(x, buf, 5);
+    }
+}
+
+msgpack_pack_inline_func(_v4raw_body)(msgpack_pack_user x, const void* b, size_t l)
+{
+    msgpack_pack_append_buffer(x, (const unsigned char*)b, l);
+}
+
 /*
  * Bin
  */
@@ -886,4 +907,3 @@ msgpack_pack_inline_func(_ext_body)(msgpack_pack_user x, const void* b, size_t l
 #undef msgpack_pack_real_int16
 #undef msgpack_pack_real_int32
 #undef msgpack_pack_real_int64
-