Fixed existing code compile error problem.

Changed macro name from MSGPACK_USE_LEGACY_CONVERT to
MSGPACK_DISABLE_LEGACY_CONVERT. msgpack-c shouldn't make compile error on
existing codes by default without major version up.
So if you want to disable msgpack::object::convert(T*), you need to define
MSGPACK_DISABLE_LEGACY_CONVERT macro.

Author: redboltz

include/msgpack/object.hpp

@@ -523,14 +523,14 @@ inline T& object::convert(T& v) const
     return v;
 }
 
-#if defined(MSGPACK_USE_LEGACY_CONVERT)
+#if !defined(MSGPACK_DISABLE_LEGACY_CONVERT)
 template <typename T>
 inline T* object::convert(T* v) const
 {
     convert(*v);
     return v;
 }
-#endif // defined(MSGPACK_USE_LEGACY_CONVERT)
+#endif // !defined(MSGPACK_DISABLE_LEGACY_CONVERT)
 
 template <typename T>
 inline bool object::convert_if_not_nil(T& v) const

include/msgpack/object_fwd.hpp

@@ -172,7 +172,7 @@ struct object {
     T& convert(T& v) const;
 
 
-#if defined(MSGPACK_USE_LEGACY_CONVERT)
+#if !defined(MSGPACK_DISABLE_LEGACY_CONVERT)
     /// Convert the object (obsolete)
     /**
      * If the object can't be converted to T, msgpack::type_error would be thrown.
@@ -182,7 +182,7 @@ struct object {
      */
     template <typename T>
     T* convert(T* v) const;
-#endif // defined(MSGPACK_USE_LEGACY_CONVERT)
+#endif // !defined(MSGPACK_DISABLE_LEGACY_CONVERT)
 
     /// Convert the object if not nil
     /**

test/convert.cpp

@@ -84,6 +84,20 @@ TEST(convert, return_value_ref)
     EXPECT_EQ(i, j);
 }
 
+#if !defined(MSGPACK_DISABLE_LEGACY_CONVERT)
+
+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);
+}
+
+#endif // !defined(MSGPACK_DISABLE_LEGACY_CONVERT)
+
 TEST(convert, if_not_nil_nil)
 {
     msgpack::object obj;