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

Fixed #191.

Browse Source 
The names of float format family are changed.

old                      new
dec                   -> f64
MSGPACK_OBJECT_DOUBLE -> MSGPACK_OBJECT_FLOAT
msgpack::type::DOUBLE -> msgpack::type::FLOAT

Client codes could have compile errors when it use dec, MSGPACK_OBJECT_DOUBLE or msgpack::type::DOUBLE.
The best way to fix such errors, update client code. If it can't, set MSGPACK_USE_LEGACY_NAME_AS_FLOAT macro.
Then both old names and new names are available.
This commit is contained in:
Takatoshi Kondo
2015-01-16 00:20:43 +09:00
parent a84f444ce2
commit 737e6703df
11 changed files with 105 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/msgpack/adaptor/float.hpp
View File

@@ -31,8 +31,8 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
inline object const& operator>> (object const& o, float& v)
{
if(o.type == type::DOUBLE) {
v = static_cast<float>(o.via.dec);
if(o.type == type::FLOAT) {
v = static_cast<float>(o.via.f64);
}
else if (o.type == type::POSITIVE_INTEGER) {
v = static_cast<float>(o.via.u64);
@@ -56,8 +56,8 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const float& v)
inline object const& operator>> (object const& o, double& v)
{
if(o.type == type::DOUBLE) {
v = o.via.dec;
if(o.type == type::FLOAT) {
v = o.via.f64;
}
else if (o.type == type::POSITIVE_INTEGER) {
v = static_cast<double>(o.via.u64);
@@ -81,14 +81,14 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const double& v)
inline void operator<< (object& o, float v)
{
o.type = type::DOUBLE;
o.via.dec = static_cast<double>(v);
o.type = type::FLOAT;
o.via.f64 = static_cast<double>(v);
}
inline void operator<< (object& o, double v)
{
o.type = type::DOUBLE;
o.via.dec = v;
o.type = type::FLOAT;
o.via.f64 = v;
}
inline void operator<< (object::with_zone& o, float v)