generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-16 18:56:54 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #358 from redboltz/fix_357

Browse Source 
Fixed #357.
This commit is contained in:
Takatoshi Kondo
2015-09-01 08:35:11 +09:00
parent 9ee1168cc4 dc2e1a4ead
commit 9b156823ff
3 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/msgpack/object.hpp
View File

@@ -511,6 +511,16 @@ inline T* object::convert(T* v) const
return v;
}
template <typename T>
inline bool object::convert_if_not_nil(T& v) const
{
if (is_nil()) {
return false;
}
convert(v);
return true;
}
#if defined(MSGPACK_USE_CPP03)
template <typename T>

3
include/msgpack/object_fwd.hpp
View File

@@ -149,6 +149,9 @@ struct object {
template <typename T>
T* convert(T* v) const;
template <typename T>
bool convert_if_not_nil(T& v) const;
object();
object(const msgpack_object& o);

17
test/convert.cpp
View File

@@ -93,3 +93,20 @@ TEST(convert, return_value_ref)
EXPECT_EQ(&i, &j);
EXPECT_EQ(i, j);
}
TEST(convert, if_not_nil_nil)
{
msgpack::object obj;
int i;
EXPECT_FALSE(obj.convert_if_not_nil(i));
}
TEST(convert, if_not_nil_not_nil)
{
msgpack::zone z;
msgpack::object obj(1, z);
int i;
EXPECT_TRUE(obj.convert_if_not_nil(i));
EXPECT_EQ(i, 1);
}