diff options
author | Feng Xiao <xiaofeng@google.com> | 2015-10-13 11:06:36 -0700 |
---|---|---|
committer | Feng Xiao <xiaofeng@google.com> | 2015-10-13 11:06:36 -0700 |
commit | b699c285942f4f21a59558aa96ad549791b51163 (patch) | |
tree | c7769708a08b4de3ab25e41142a08a5b6da7f866 | |
parent | 49f24afb45b7add17af3ed4493fa0a94d1cc64da (diff) | |
parent | 59906e81d844555b86c6cf253c63750bfdf2a772 (diff) | |
download | protobuf-b699c285942f4f21a59558aa96ad549791b51163.tar.gz protobuf-b699c285942f4f21a59558aa96ad549791b51163.tar.bz2 protobuf-b699c285942f4f21a59558aa96ad549791b51163.zip |
Merge pull request #876 from tkarls/use_correct_int_type_in_set_function
Changed argument typ to uint32 in set function that sets an uint32 value
-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 72a1b1a3..6bc65604 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -275,7 +275,7 @@ class LIBPROTOBUF_EXPORT MapValueRef { "MapValueRef::SetInt32Value"); *reinterpret_cast<int32*>(data_) = value; } - void SetUInt32Value(uint64 value) { + void SetUInt32Value(uint32 value) { TYPE_CHECK(FieldDescriptor::CPPTYPE_UINT32, "MapValueRef::SetUInt32Value"); *reinterpret_cast<uint32*>(data_) = value; |