Skip to content

Fix 417 #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
redboltz merged 2 commits into from
Mar 2, 2016
Merged

Fix 417 #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acf4ac0
Fixed #417.
redboltz Feb 22, 2016
1244ede
Removed the test that uses msgpack::object with std::string on versio…
redboltz Feb 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/msgpack/v2/adaptor/adaptor_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion include/msgpack/v2/adaptor/adaptor_base_decl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions test/object_with_zone.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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)
{
Expand Down