generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-05-27 23:10:20 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/davidchappelle/msgpack-c into davidchappelle-master

Browse Source
This commit is contained in:
Takatoshi Kondo 2015-05-27 21:18:33 +09:00
commit b225f15f29
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/msgpack/object.hpp
View File

@ -386,15 +386,17 @@ inline msgpack::object::implicit_type object::convert() const
}
template <typename T>
inline void object::convert(T& v) const
inline T& object::convert(T& v) const
{
msgpack::operator>>(*this, v);
return v;
}
template <typename T>
inline void object::convert(T* v) const
inline T* object::convert(T* v) const
{
convert(*v);
return v;
}
template <typename T>

4
include/msgpack/object_fwd.hpp
View File

@ -106,9 +106,9 @@ struct object {
T as() const;
template <typename T>
void convert(T& v) const;
T& convert(T& v) const;
template <typename T>
void convert(T* v) const;
T* convert(T* v) const;
object();