generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-15 15:16:51 +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

42
test/msgpack_c.cpp
View File

@@ -223,13 +223,28 @@ TEST(MSGPACKC, simple_buffer_float)
msgpack_unpack_return ret =
msgpack_unpack(sbuf.data, sbuf.size, NULL, &z, &obj);
EXPECT_EQ(MSGPACK_UNPACK_SUCCESS, ret);
EXPECT_EQ(MSGPACK_OBJECT_FLOAT, obj.type);
#if defined(MSGPACK_USE_LEGACY_NAME_AS_FLOAT)
EXPECT_EQ(MSGPACK_OBJECT_DOUBLE, obj.type);
if (isnan(val))
#endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT
if (isnan(val)) {
EXPECT_TRUE(isnan(obj.via.f64));
#if defined(MSGPACK_USE_LEGACY_NAME_AS_FLOAT)
EXPECT_TRUE(isnan(obj.via.dec));
else if (isinf(val))
#endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT
}
else if (isinf(val)) {
EXPECT_TRUE(isinf(obj.via.f64));
#if defined(MSGPACK_USE_LEGACY_NAME_AS_FLOAT)
EXPECT_TRUE(isinf(obj.via.dec));
else
#endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT
}
else {
EXPECT_TRUE(fabs(obj.via.f64 - val) <= kEPS);
#if defined(MSGPACK_USE_LEGACY_NAME_AS_FLOAT)
EXPECT_TRUE(fabs(obj.via.dec - val) <= kEPS);
#endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT
}
msgpack_zone_destroy(&z);
msgpack_sbuffer_destroy(&sbuf);
}
@@ -273,13 +288,28 @@ TEST(MSGPACKC, simple_buffer_double)
msgpack_unpack_return ret =
msgpack_unpack(sbuf.data, sbuf.size, NULL, &z, &obj);
EXPECT_EQ(MSGPACK_UNPACK_SUCCESS, ret);
EXPECT_EQ(MSGPACK_OBJECT_FLOAT, obj.type);
#if defined(MSGPACK_USE_LEGACY_NAME_AS_FLOAT)
EXPECT_EQ(MSGPACK_OBJECT_DOUBLE, obj.type);
if (isnan(val))
#endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT
if (isnan(val)) {
EXPECT_TRUE(isnan(obj.via.f64));
#if defined(MSGPACK_USE_LEGACY_NAME_AS_FLOAT)
EXPECT_TRUE(isnan(obj.via.dec));
else if (isinf(val))
#endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT
}
else if (isinf(val)) {
EXPECT_TRUE(isinf(obj.via.f64));
#if defined(MSGPACK_USE_LEGACY_NAME_AS_FLOAT)
EXPECT_TRUE(isinf(obj.via.dec));
else
#endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT
}
else {
EXPECT_TRUE(fabs(obj.via.f64 - val) <= kEPS);
#if defined(MSGPACK_USE_LEGACY_NAME_AS_FLOAT)
EXPECT_TRUE(fabs(obj.via.dec - val) <= kEPS);
#endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT
}
msgpack_zone_destroy(&z);
msgpack_sbuffer_destroy(&sbuf);
}