Merge pull request #434 from redboltz/fix_417

Fix 417

Author: redboltz

include/msgpack/v2/adaptor/adaptor_base.hpp

@@ -32,7 +32,7 @@ struct pack : v1::adaptor::pack<T, Enabler> {
 };
 
 template <typename T, typename Enabler>
-struct object : v1::adaptor::object<T, Enabler> {
+struct object<T, Enabler, typename msgpack::enable_if<!msgpack::is_same<T, std::string>::value>::type> : v1::adaptor::object<T, Enabler> {
 };
 
 template <typename T, typename Enabler>

include/msgpack/v2/adaptor/adaptor_base_decl.hpp

@@ -30,7 +30,7 @@ struct convert;
 template <typename T, typename Enabler = void>
 struct pack;
 
-template <typename T, typename Enabler = void>
+template <typename T, typename Enabler = void, typename Enabler2 = void>
 struct object;
 
 template <typename T, typename Enabler = void>

test/object_with_zone.cpp

@@ -316,6 +316,8 @@ TEST(object_with_zone, string)
     EXPECT_EQ(obj.as<string>()[0], 'a');
 }
 
+#if MSGPACK_DEFAULT_API_VERSION == 1
+
 TEST(object_without_zone, string)
 {
     string v = "abc";
@@ -326,6 +328,8 @@ TEST(object_without_zone, string)
     EXPECT_EQ(obj.as<string>()[0], 'd');
 }
 
+#endif // MSGPACK_DEFAULT_API_VERSION == 1
+
 // char*
 TEST(object_with_zone, char_ptr)
 {