Merge pull request #100 from redboltz/add_vector_char_as_bin

vector<char> is mapped to BIN

include/msgpack/adaptor/vector_char.hpp

@@ -0,0 +1,72 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2014 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.
+//
+#ifndef MSGPACK_TYPE_VECTOR_CHAR_HPP
+#define MSGPACK_TYPE_VECTOR_CHAR_HPP
+
+#include "msgpack/object.hpp"
+#include <vector>
+
+namespace msgpack {
+
+inline std::vector<char>& operator>> (object const& o, std::vector<char>& v)
+{
+    switch (o.type) {
+    case type::BIN:
+        v.resize(o.via.bin.size);
+        std::memcpy(v.data(), o.via.bin.ptr, o.via.bin.size);
+        break;
+    case type::STR:
+        v.resize(o.via.str.size);
+        std::memcpy(v.data(), o.via.str.ptr, o.via.str.size);
+        break;
+    default:
+        throw type_error();
+        break;
+    }
+    return v;
+}
+
+template <typename Stream>
+inline packer<Stream>& operator<< (packer<Stream>& o, const std::vector<char>& v)
+{
+    o.pack_bin(v.size());
+    o.pack_bin_body(v.data(), v.size());
+
+    return o;
+}
+
+inline void operator<< (object& o, const std::vector<char>& v)
+{
+    o.type = type::BIN;
+    o.via.bin.ptr = v.data();
+    o.via.bin.size = static_cast<uint32_t>(v.size());
+}
+
+inline void operator<< (object::with_zone& o, const std::vector<char>& v)
+{
+    o.type = type::BIN;
+    char* ptr = static_cast<char*>(o.zone->allocate_align(v.size()));
+    o.via.bin.ptr = ptr;
+    o.via.bin.size = static_cast<uint32_t>(v.size());
+    std::memcpy(ptr, v.data(), v.size());
+}
+
+}  // namespace msgpack
+
+#endif // MSGPACK_TYPE_VECTOR_CHAR_HPP
+

include/msgpack/type.hpp

@@ -12,6 +12,7 @@
 #include "adaptor/set.hpp"
 #include "adaptor/string.hpp"
 #include "adaptor/vector.hpp"
+#include "adaptor/vector_char.hpp"
 #include "adaptor/msgpack_tuple.hpp"
 #include "adaptor/define.hpp"
 #include "adaptor/tr1/unordered_map.hpp"

test/msgpack_test.cpp

@@ -467,6 +467,7 @@ TEST(MSGPACK_STL, simple_buffer_string)
     msgpack::pack(sbuf, val1);
     msgpack::unpacked ret;
     msgpack::unpack(ret, sbuf.data(), sbuf.size());
+    EXPECT_EQ(ret.get().type, msgpack::type::STR);
     string val2 = ret.get().as<string>();
     EXPECT_EQ(val1.size(), val2.size());
     EXPECT_EQ(val1, val2);
@@ -484,6 +485,7 @@ TEST(MSGPACK_STL, simple_buffer_vector)
     msgpack::pack(sbuf, val1);
     msgpack::unpacked ret;
     msgpack::unpack(ret, sbuf.data(), sbuf.size());
+    EXPECT_EQ(ret.get().type, msgpack::type::ARRAY);
     vector<int> val2 = ret.get().as<vector<int> >();
     EXPECT_EQ(val1.size(), val2.size());
     EXPECT_TRUE(equal(val1.begin(), val1.end(), val2.begin()));
@@ -491,6 +493,23 @@ TEST(MSGPACK_STL, simple_buffer_vector)
   }
 }
 
+TEST(MSGPACK_STL, simple_buffer_vector_char)
+{
+  for (unsigned int k = 0; k < kLoop; k++) {
+    vector<char> val1;
+    for (unsigned int i = 0; i < kElements; i++)
+      val1.push_back(rand());
+    msgpack::sbuffer sbuf;
+    msgpack::pack(sbuf, val1);
+    msgpack::unpacked ret;
+    msgpack::unpack(ret, sbuf.data(), sbuf.size());
+    EXPECT_EQ(ret.get().type, msgpack::type::BIN);
+    vector<char> val2 = ret.get().as<vector<char> >();
+    EXPECT_EQ(val1.size(), val2.size());
+    EXPECT_TRUE(equal(val1.begin(), val1.end(), val2.begin()));
+  }
+}
+
 TEST(MSGPACK_STL, simple_buffer_map)
 {
   for (unsigned int k = 0; k < kLoop; k++) {