Fixed msgpack#399

Removed the pointer version of object::convert().
Updated tests and documents.

Migration note:

Replace
  int i;
  obj.convert(&i); // Removed pointer version
with
  int i;
  obj.convert(i);  // Reference version

QUICKSTART-CPP.md

@@ -40,7 +40,7 @@ int main(void) {
 
         // convert it into statically typed object.
         std::vector<std::string> rvec;
-        obj.convert(&rvec);
+        obj.convert(rvec);
 }
 ```
 
@@ -154,6 +154,6 @@ int main(void) {
 
         // you can convert object to myclass directly
         std::vector<myclass> rvec;
-        obj.convert(&rvec);
+        obj.convert(rvec);
 }
 ```

README.md

@@ -96,7 +96,7 @@ int main(void)
     // convert msgpack::object instance into the original type.
     // if the type is mismatched, it throws msgpack::type_error exception.
     msgpack::type::tuple<int, bool, std::string> dst;
-    deserialized.convert(&dst);
+    deserialized.convert(dst);
 
     return 0;
 }

example/cpp03/custom.cpp

@@ -44,7 +44,7 @@ int main(void)
         msgpack::unpack(result, sbuf.str().data(), sbuf.str().size());
         msgpack::object obj = result.get();
 
-        obj.convert(&nc);
+        obj.convert(nc);
 
         std::cout << obj << " value=" << nc.value << " flag=" << nc.flag << std::endl;
     }
@@ -60,7 +60,7 @@ int main(void)
         msgpack::unpack(result, sbuf.str().data(), sbuf.str().size());
         msgpack::object obj = result.get();
 
-        obj.convert(&oc);
+        obj.convert(oc);
 
         std::cout << obj << " value=" << oc.value << std::endl;
     }

example/cpp03/simple.cpp

@@ -40,7 +40,7 @@ int main(void)
     // convert msgpack::object instance into the original type.
     // if the type is mismatched, it throws msgpack::type_error exception.
     msgpack::type::tuple<int, bool, std::string> dst;
-    deserialized.convert(&dst);
+    deserialized.convert(dst);
 
     return 0;
 }

example/cpp03/speed_test.cpp

@@ -50,7 +50,7 @@ void test_map_pack_unpack() {
     std::cout << "Start converting..." << std::endl;
     {
         boost::timer::cpu_timer timer;
-        unpacked.get().convert(&m2);
+        unpacked.get().convert(m2);
         std::string result = timer.format();
         std::cout << result << std::endl;
     }

example/cpp03/speed_test_nested_array.cpp

@@ -73,7 +73,7 @@ void test_array_of_array() {
     std::cout << "Start converting..." << std::endl;
     {
         boost::timer::cpu_timer timer;
-        unpacked.get().convert(&v2);
+        unpacked.get().convert(v2);
         std::string result = timer.format();
         std::cout << result << std::endl;
     }

include/msgpack/object.hpp

@@ -523,13 +523,6 @@ inline T& object::convert(T& v) const
     return v;
 }
 
-template <typename T>
-inline T* object::convert(T* v) const
-{
-    convert(*v);
-    return v;
-}
-
 template <typename T>
 inline bool object::convert_if_not_nil(T& v) const
 {

test/convert.cpp

@@ -33,10 +33,10 @@ TEST(convert, compatibility_less)
     src[0] = "kumofs";
 
     msgpack::zone z;
-    msgpack::object obj(src, &z);
+    msgpack::object obj(src, z);
 
     compatibility c;
-    EXPECT_NO_THROW( obj.convert(&c) );
+    EXPECT_NO_THROW( obj.convert(c) );
 
     EXPECT_EQ("kumofs",  c.str1);
     EXPECT_EQ("default", c.str2);
@@ -50,10 +50,10 @@ TEST(convert, compatibility_more)
     src[2] = "cloudy";
 
     msgpack::zone z;
-    msgpack::object obj(src, &z);
+    msgpack::object obj(src, z);
 
     compatibility to;
-    EXPECT_NO_THROW( obj.convert(&to) );
+    EXPECT_NO_THROW( obj.convert(to) );
 
     EXPECT_EQ("kumofs", to.str1);
     EXPECT_EQ("mpio",   to.str2);
@@ -65,24 +65,14 @@ TEST(convert, enum_member)
     src.flag = enum_member::B;
 
     msgpack::zone z;
-    msgpack::object obj(src, &z);
+    msgpack::object obj(src, z);
 
     enum_member to;
-    EXPECT_NO_THROW( obj.convert(&to) );
+    EXPECT_NO_THROW( obj.convert(to) );
 
     EXPECT_EQ(enum_member::B, to.flag);
 }
 
-TEST(convert, return_value_ptr)
-{
-    msgpack::zone z;
-    msgpack::object obj(1, z);
-
-    int i;
-    EXPECT_EQ(obj.convert(&i), &i);
-    EXPECT_EQ(1, i);
-}
-
 TEST(convert, return_value_ref)
 {
     msgpack::zone z;

test/fixint.cpp

@@ -33,7 +33,7 @@ void check_convert() {
     msgpack::unpack(&msg, sbuf.data(), sbuf.size());
 
     T v2;
-    msg.get().convert(&v2);
+    msg.get().convert(v2);
 
     EXPECT_EQ(v1.get(), v2.get());
 
@@ -52,4 +52,3 @@ TEST(fixint, convert)
     check_convert<msgpack::type::fix_uint32>();
     check_convert<msgpack::type::fix_uint64>();
 }
-

test/msgpack_stream.cpp

@@ -45,7 +45,7 @@ const unsigned int kLoop = 1000;
         if (it == vec.end()) goto out;                                  \
         msgpack::object obj = result.get();                             \
         vec_type::value_type val;                                       \
-        obj.convert(&val);                                              \
+        obj.convert(val);                                               \
         EXPECT_EQ(*it, val);                                            \
         ++it;                                                           \
       }                                                                 \

test/object.cpp

@@ -72,7 +72,7 @@ TEST(object, convert)
     msgpack::unpack(ret, sbuf.data(), sbuf.size());
 
     myclass m2;
-    ret.get().convert(&m2);
+    ret.get().convert(m2);
 
     EXPECT_EQ(m1, m2);
 }

test/user_class.cpp

@@ -149,13 +149,13 @@ class TestUnionMemberClass
   void msgpack_unpack(msgpack::object o)
   {
     msgpack::type::tuple<bool, msgpack::object> tuple;
-    o.convert(&tuple);
+    o.convert(tuple);
 
     is_double = tuple.get<0>();
     if (is_double)
-      tuple.get<1>().convert(&value.f);
+      tuple.get<1>().convert(value.f);
     else
-      tuple.get<1>().convert(&value.i);
+      tuple.get<1>().convert(value.i);
   }
 };