Added msgpack prefix to support API versioning.

This commit is contained in:
Takatoshi Kondo
2015-03-05 00:12:47 +09:00
parent f6d0cd9a4b
commit f399ec8c30
58 changed files with 2236 additions and 2236 deletions

View File

@@ -29,15 +29,15 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
// FIXME check overflow, underflow
inline object const& operator>> (object const& o, float& v)
inline msgpack::object const& operator>> (msgpack::object const& o, float& v)
{
if(o.type == type::FLOAT) {
if(o.type == msgpack::type::FLOAT) {
v = static_cast<float>(o.via.f64);
}
else if (o.type == type::POSITIVE_INTEGER) {
else if (o.type == msgpack::type::POSITIVE_INTEGER) {
v = static_cast<float>(o.via.u64);
}
else if (o.type == type::NEGATIVE_INTEGER) {
else if (o.type == msgpack::type::NEGATIVE_INTEGER) {
v = static_cast<float>(o.via.i64);
}
else {
@@ -54,15 +54,15 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const float& v)
}
inline object const& operator>> (object const& o, double& v)
inline msgpack::object const& operator>> (msgpack::object const& o, double& v)
{
if(o.type == type::FLOAT) {
if(o.type == msgpack::type::FLOAT) {
v = o.via.f64;
}
else if (o.type == type::POSITIVE_INTEGER) {
else if (o.type == msgpack::type::POSITIVE_INTEGER) {
v = static_cast<double>(o.via.u64);
}
else if (o.type == type::NEGATIVE_INTEGER) {
else if (o.type == msgpack::type::NEGATIVE_INTEGER) {
v = static_cast<double>(o.via.i64);
}
else {
@@ -79,23 +79,23 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const double& v)
}
inline void operator<< (object& o, float v)
inline void operator<< (msgpack::object& o, float v)
{
o.type = type::FLOAT;
o.type = msgpack::type::FLOAT;
o.via.f64 = static_cast<double>(v);
}
inline void operator<< (object& o, double v)
inline void operator<< (msgpack::object& o, double v)
{
o.type = type::FLOAT;
o.type = msgpack::type::FLOAT;
o.via.f64 = v;
}
inline void operator<< (object::with_zone& o, float v)
{ static_cast<object&>(o) << v; }
inline void operator<< (msgpack::object::with_zone& o, float v)
{ static_cast<msgpack::object&>(o) << v; }
inline void operator<< (object::with_zone& o, double v)
{ static_cast<object&>(o) << v; }
inline void operator<< (msgpack::object::with_zone& o, double v)
{ static_cast<msgpack::object&>(o) << v; }
} // MSGPACK_API_VERSION_NAMESPACE(v1)