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

Merge branch 'reference-args'

Browse Source
This commit is contained in:
Nobuyuki Kubota 2015-03-10 19:16:37 +09:00
commit ac1eb6e1d3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/msgpack/object.hpp
View File

@ -523,13 +523,13 @@ object::object(const T& v, zone* z)
} }
inline object::object(msgpack_object o) inline object::object(const msgpack_object& o)
{ {
// FIXME beter way? // FIXME beter way?
std::memcpy(this, &o, sizeof(o)); std::memcpy(this, &o, sizeof(o));
} }
inline void operator<< (object& o, msgpack_object v) inline void operator<< (object& o, const msgpack_object& v)
{ {
// FIXME beter way? // FIXME beter way?
std::memcpy(&o, &v, sizeof(v)); std::memcpy(&o, &v, sizeof(v));

2
include/msgpack/object_fwd.hpp
View File

@ -110,7 +110,7 @@ struct object {
object(); object();
object(msgpack_object o); object(const msgpack_object& o);
template <typename T> template <typename T>
explicit object(const T& v); explicit object(const T& v);