generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-06-01 21:03:41 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #434 from redboltz/fix_417

Browse Source 
Fix 417
This commit is contained in:
Takatoshi Kondo 2016-03-02 09:56:53 +09:00
commit d8e9941fa9
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/msgpack/v2/adaptor/adaptor_base.hpp
View File

@ -32,7 +32,7 @@ struct pack : v1::adaptor::pack<T, Enabler> {
}; };
template <typename T, typename 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> template <typename T, typename Enabler>

2
include/msgpack/v2/adaptor/adaptor_base_decl.hpp
View File

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

4
test/object_with_zone.cpp
View File

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