diff options
| author |  Feng Xiao <xiaofeng@google.com> | 2015-10-13 16:52:50 -0700 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2015-10-13 16:52:50 -0700 |
| commit | 8894d1febf953d473d222d3eac5f1549c3ea40a5 (patch) | |
| tree | f825a6bf50abd1bd329019334b9aad18cf5ba380 /src/google/protobuf/map.h | |
| parent | 3af705452787a06c9c14a0df440750e45b7d81f1 (diff) | |
| parent | b7996f09296d2f3c9b046c2370d88cc71c1ef022 (diff) | |
Merge pull request #875 from tkarls/return_correct_bool_type_from_map
Changed return type from int32 to bool in function returning a bool
Diffstat (limited to 'src/google/protobuf/map.h')
| -rw-r--r-- | src/google/protobuf/map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h index 6bc65604..52fba603 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -155,7 +155,7 @@ class LIBPROTOBUF_EXPORT MapKey { "MapKey::GetUInt32Value"); return val_.uint32_value_; } - int32 GetBoolValue() const { + bool GetBoolValue() const { TYPE_CHECK(FieldDescriptor::CPPTYPE_BOOL, "MapKey::GetBoolValue"); return val_.bool_value_; |