nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate portable_storage_to_bin.h reliance on pragma_comp_defs.h

Browse Source 
The `-Wstrict-aliasing` warning issue was already fixed by someone earlier.
And for the `-Wtautological-constant-out-of-range-compare` (wordy) warning,
I replaced `val <= 4611686018427387903` assertion with `!(val >> 31 >> 31)`
expression. These expressions are equivalent but the latter is defined if
the size_t type is only 32-bits wide. Another way to think about it is that
the expression is checking if any bit after the 61st bit is set.
This commit is contained in:
Jeffrey 2022-03-06 00:48:38 -06:00
parent 6d4727c714
commit 36933c7f5c
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/epee/include/storages/portable_storage_to_bin.h
View File

@ -28,7 +28,6 @@
#pragma once #pragma once
#include "pragma_comp_defs.h"
#include "misc_language.h" #include "misc_language.h"
#include "portable_storage_base.h" #include "portable_storage_base.h"
#include "portable_storage_bin_utils.h" #include "portable_storage_bin_utils.h"
@ -49,12 +48,7 @@ namespace epee
return sizeof(pack_value); return sizeof(pack_value);
} }
PRAGMA_WARNING_PUSH template<class t_stream>
PRAGMA_GCC("GCC diagnostic ignored \"-Wstrict-aliasing\"")
#ifdef __clang__
PRAGMA_GCC("GCC diagnostic ignored \"-Wtautological-constant-out-of-range-compare\"")
#endif
template<class t_stream>
size_t pack_varint(t_stream& strm, size_t val) size_t pack_varint(t_stream& strm, size_t val)
{ //the first two bits always reserved for size information { //the first two bits always reserved for size information
@ -70,13 +64,13 @@ namespace epee
return pack_varint_t<uint32_t>(strm, PORTABLE_RAW_SIZE_MARK_DWORD, val); return pack_varint_t<uint32_t>(strm, PORTABLE_RAW_SIZE_MARK_DWORD, val);
}else }else
{ {
CHECK_AND_ASSERT_THROW_MES(val <= 4611686018427387903, "failed to pack varint - too big amount = " << val); // Same as checking val <= 4611686018427387903 except that it's portable for 32-bit size_t
CHECK_AND_ASSERT_THROW_MES(!(val >> 31 >> 31), "failed to pack varint - too big amount = " << val);
return pack_varint_t<uint64_t>(strm, PORTABLE_RAW_SIZE_MARK_INT64, val); return pack_varint_t<uint64_t>(strm, PORTABLE_RAW_SIZE_MARK_INT64, val);
} }
} }
PRAGMA_WARNING_POP
template<class t_stream> template<class t_stream>
bool put_string(t_stream& strm, const std::string& v) bool put_string(t_stream& strm, const std::string& v)
{ {
pack_varint(strm, v.size()); pack_varint(strm, v.size());