Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +3 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2d0122f1ed - Show all commits

4
src/crypto/crc.cpp
View file

@ -606,6 +606,8 @@ static const uint32_t crc_c[256] = {
uint64_t _mm_crc32_u64(uint64_t a, uint64_t b ) uint64_t _mm_crc32_u64(uint64_t a, uint64_t b )
{ {
// Squelch warning about unusued variable crc_c
(void)(crc_c);
return crc32cSlicingBy8(a, (unsigned char*)&b, sizeof(b)); return crc32cSlicingBy8(a, (unsigned char*)&b, sizeof(b));
} }
/* /*
@ -615,8 +617,6 @@ uint64_t _mm_crc32_u64(uint64_t a, uint64_t b )
int main( int argc, char** argv ) int main( int argc, char** argv )
{ {
// Squelch warning about unusued variable crc_c
(void)(crc_c);
uint64_t f = 0x1234; uint64_t f = 0x1234;
uint64_t a = 0x5678; uint64_t a = 0x5678;
uint32_t f1 = _mm_crc32_u64(f, a); uint32_t f1 = _mm_crc32_u64(f, a);

2
tests/io/json_tests.cpp
View file

@ -171,7 +171,7 @@ static bool equal( const fc::variant& a, const fc::variant& b )
return true; return true;
case fc::variant::type_id::blob_type: case fc::variant::type_id::blob_type:
default: default:
FC_THROW_EXCEPTION( fc::invalid_arg_exception, "Unsupported variant type: " + std::to_string( a.get_type() ) ); FC_THROW_EXCEPTION( fc::invalid_arg_exception, "Unsupported variant type: {t}", ( "t", a.get_type() ) );
} }
} }