Skip to content

Commit d21b0c0

Browse files
AzothAmmoAzothAmmo
committed
Merge branch 'laudrup-master' into develop
see USCiLab#363
2 parents 29829c1 + e63f08f commit d21b0c0

File tree

8 files changed

+20
-22
lines changed

8 files changed

+20
-22
lines changed

‎include/cereal/details/polymorphic_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ namespace cereal
716716
//! Binding for non abstract types
717717
void bind(std::false_type) const
718718
{
719-
instantiate_polymorphic_binding((T*) 0, 0, Tag{}, adl_tag{});
719+
instantiate_polymorphic_binding(static_cast<T*>(nullptr), 0, Tag{}, adl_tag{});
720720
}
721721

722722
//! Binding for abstract types

‎include/cereal/external/base64.hpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ namespace cereal
5050
while (in_len--) {
5151
char_array_3[i++] = *(bytes_to_encode++);
5252
if (i == 3) {
53-
char_array_4[0] = (unsigned char) ((char_array_3[0] & 0xfc) >> 2);
54-
char_array_4[1] = (unsigned char) ( ( ( char_array_3[0] & 0x03 ) << 4 ) + ( ( char_array_3[1] & 0xf0 ) >> 4 ) );
55-
char_array_4[2] = (unsigned char) ( ( ( char_array_3[1] & 0x0f ) << 2 ) + ( ( char_array_3[2] & 0xc0 ) >> 6 ) );
56-
char_array_4[3] = (unsigned char) ( char_array_3[2] & 0x3f );
53+
char_array_4[0] = static_cast<unsigned char>((char_array_3[0] & 0xfc) >> 2);
54+
char_array_4[1] = static_cast<unsigned char>( ( ( char_array_3[0] & 0x03 ) << 4 ) + ( ( char_array_3[1] & 0xf0 ) >> 4 ) );
55+
char_array_4[2] = static_cast<unsigned char>( ( ( char_array_3[1] & 0x0f ) << 2 ) + ( ( char_array_3[2] & 0xc0 ) >> 6 ) );
56+
char_array_4[3] = static_cast<unsigned char>( char_array_3[2] & 0x3f );
5757

5858
for(i = 0; (i <4) ; i++)
5959
ret += chars[char_array_4[i]];
@@ -76,11 +76,9 @@ namespace cereal
7676

7777
while((i++ < 3))
7878
ret += '=';
79-
8079
}
8180

8281
return ret;
83-
8482
}
8583

8684
inline std::string decode(std::string const& encoded_string) {
@@ -95,7 +93,7 @@ namespace cereal
9593
char_array_4[i++] = encoded_string[in_]; in_++;
9694
if (i ==4) {
9795
for (i = 0; i <4; i++)
98-
char_array_4[i] = (unsigned char) chars.find( char_array_4[i] );
96+
char_array_4[i] = static_cast<unsigned char>(chars.find( char_array_4[i] ));
9997

10098
char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
10199
char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
@@ -112,7 +110,7 @@ namespace cereal
112110
char_array_4[j] = 0;
113111

114112
for (j = 0; j <4; j++)
115-
char_array_4[j] = (unsigned char) chars.find( char_array_4[j] );
113+
char_array_4[j] = static_cast<unsigned char>(chars.find( char_array_4[j] ));
116114

117115
char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
118116
char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);

‎sandbox/sandbox.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -651,9 +651,9 @@ int main()
651651
iar( d1 );
652652
assert( d1->x == 4 && d1->y == 3 );
653653
iar( d2 );
654-
assert( ((Derived*)d2.get())->x == 5 && ((Derived*)d2.get())->y == 4 );
654+
assert( dynamic_cast<Derived*>(d2.get())->x == 5 && dynamic_cast<Derived*>(d2.get())->y == 4 );
655655
iar( d3 );
656-
assert( ((Derived*)d3.get())->x == 6 && ((Derived*)d3.get())->y == 5 );
656+
assert( dynamic_cast<Derived*>(d3.get())->x == 6 && dynamic_cast<Derived*>(d3.get())->y == 5 );
657657
}
658658

659659
{

‎sandbox/sandbox_json.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,13 +320,13 @@ enum Bla
320320
template <class Archive>
321321
void save( Archive & ar, Bla const & b )
322322
{
323-
ar( (const int &)b );
323+
ar( static_cast<const int &>(b) );
324324
}
325325

326326
template <class Archive>
327327
void load( Archive & ar, Bla & b )
328328
{
329-
ar( (int&)b );
329+
ar( static_cast<int&>(b) );
330330
}
331331

332332
CEREAL_SPECIALIZE_FOR_ALL_ARCHIVES( Bla, cereal::specialization::non_member_load_save )

‎unittests/pod.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void test_pod()
132132
BOOST_CHECK_EQUAL(i_int32 , o_int32);
133133
BOOST_CHECK_EQUAL(i_uint64 , o_uint64);
134134
BOOST_CHECK_EQUAL(i_int64 , o_int64);
135-
BOOST_CHECK_CLOSE(i_float , o_float, (float)1e-5);
135+
BOOST_CHECK_CLOSE(i_float , o_float, 1e-5F);
136136
BOOST_CHECK_CLOSE(i_double , o_double, 1e-5);
137137

138138
BOOST_CHECK_CLOSE(i_long_double, o_long_double, 1e-5);

‎unittests/polymorphic.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -322,13 +322,13 @@ void test_polymorphic()
322322
#endif
323323

324324
BOOST_CHECK_EQUAL(i_shared.get(), i_locked.get());
325-
BOOST_CHECK_EQUAL(*((PolyDerived*)i_shared.get()), *((PolyDerived*)o_shared.get()));
326-
BOOST_CHECK_EQUAL(*((PolyDerived*)i_shared.get()), *((PolyDerived*)i_locked.get()));
327-
BOOST_CHECK_EQUAL(*((PolyDerived*)i_locked.get()), *((PolyDerived*)o_locked.get()));
328-
BOOST_CHECK_EQUAL(*((PolyDerived*)i_unique.get()), *((PolyDerived*)o_unique.get()));
325+
BOOST_CHECK_EQUAL(*dynamic_cast<PolyDerived*>(i_shared.get()), *dynamic_cast<PolyDerived*>(o_shared.get()));
326+
BOOST_CHECK_EQUAL(*dynamic_cast<PolyDerived*>(i_shared.get()), *dynamic_cast<PolyDerived*>(i_locked.get()));
327+
BOOST_CHECK_EQUAL(*dynamic_cast<PolyDerived*>(i_locked.get()), *dynamic_cast<PolyDerived*>(o_locked.get()));
328+
BOOST_CHECK_EQUAL(*dynamic_cast<PolyDerived*>(i_unique.get()), *dynamic_cast<PolyDerived*>(o_unique.get()));
329329

330-
BOOST_CHECK_EQUAL(*((PolyDerivedLA*)i_sharedLA.get()), *((PolyDerivedLA*)o_sharedLA.get()));
331-
BOOST_CHECK_EQUAL(*((PolyDerivedLA*)i_sharedLA2.get()), *((PolyDerivedLA*)o_sharedLA.get()));
330+
BOOST_CHECK_EQUAL(*dynamic_cast<PolyDerivedLA*>(i_sharedLA.get()), *dynamic_cast<PolyDerivedLA*>(o_sharedLA.get()));
331+
BOOST_CHECK_EQUAL(*dynamic_cast<PolyDerivedLA*>(i_sharedLA2.get()), *dynamic_cast<PolyDerivedLA*>(o_sharedLA.get()));
332332

333333
BOOST_CHECK_EQUAL(i_sharedA.get(), i_lockedA.get());
334334
BOOST_CHECK_EQUAL(*dynamic_cast<PolyDerivedD*>(i_sharedA.get()), *dynamic_cast<PolyDerivedD*>(o_sharedA.get()));

‎unittests/portable_binary_archive.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ inline void swapBytes( T & t )
7272
BOOST_CHECK_EQUAL(i_int32 , o_int32); \
7373
BOOST_CHECK_EQUAL(i_uint64 , o_uint64); \
7474
BOOST_CHECK_EQUAL(i_int64 , o_int64); \
75-
if( !std::isnan(i_float) && !std::isnan(o_float) ) BOOST_CHECK_CLOSE(i_float , o_float, (float)1e-5); \
75+
if( !std::isnan(i_float) && !std::isnan(o_float) ) BOOST_CHECK_CLOSE(i_float , o_float, 1e-5F); \
7676
if( !std::isnan(i_float) && !std::isnan(o_float) ) BOOST_CHECK_CLOSE(i_double , o_double, 1e-5);
7777

7878
// Last parameter exists to keep everything hidden in options

‎unittests/structs_specialized.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ void test_structs_specialized()
441441
BOOST_CHECK(i_ispl.x == o_ispl.x);
442442
BOOST_CHECK(i_isplv.x == o_isplv.x);
443443

444-
BOOST_CHECK_EQUAL(((SpecializedMSplitPolymorphic*)i_shared_ispl.get())->x, ((SpecializedMSplitPolymorphic*)o_shared_ispl.get())->x);
444+
BOOST_CHECK_EQUAL(dynamic_cast<SpecializedMSplitPolymorphic*>(i_shared_ispl.get())->x, dynamic_cast<SpecializedMSplitPolymorphic*>(o_shared_ispl.get())->x);
445445

446446
BOOST_CHECK(i_isplm.x == o_isplm.x);
447447
BOOST_CHECK(i_isplvm.x == o_isplvm.x);

0 commit comments

Comments
 (0)