AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fixes MSVC compiler warning C4800 "Forcing value to bool 'true' or 'false'" (#4350)

Browse Source
This commit is contained in:
Alexey Malov 2018-03-26 23:42:11 +03:00 committed by Feng Xiao
parent ac673763f7
commit 379b7ff42a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/google/protobuf/generated_message_util.h
View File

@ -175,7 +175,7 @@ struct LIBPROTOBUF_EXPORT FieldMetadata {
inline bool IsPresent(const void* base, uint32 hasbit) { inline bool IsPresent(const void* base, uint32 hasbit) {
const uint32* has_bits_array = static_cast<const uint32*>(base); const uint32* has_bits_array = static_cast<const uint32*>(base);
return has_bits_array[hasbit / 32] & (1u << (hasbit & 31)); return (has_bits_array[hasbit / 32] & (1u << (hasbit & 31))) != 0;
} }
inline bool IsOneofPresent(const void* base, uint32 offset, uint32 tag) { inline bool IsOneofPresent(const void* base, uint32 offset, uint32 tag) {

2
src/google/protobuf/io/coded_stream.h
View File

@ -851,7 +851,7 @@ class LIBPROTOBUF_EXPORT CodedOutputStream {
} }
static bool IsDefaultSerializationDeterministic() { static bool IsDefaultSerializationDeterministic() {
return default_serialization_deterministic_.load(std::memory_order_relaxed); return default_serialization_deterministic_.load(std::memory_order_relaxed) != 0;
} }
private: private: