diff options
| author |  Bo Yang <teboring@google.com> | 2017-06-22 15:39:19 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2017-06-23 11:58:05 -0700 |
| commit | 9c0b35cf620c4904a18e25733f50c9c0474fefa6 (patch) | |
| tree | d0010edbebaf6af9c4b6d1b0c5a8daa7b5102c03 /src/google/protobuf/map_field_lite.h | |
| parent | f752d816b780fff2a6af80f330a808874e63621f (diff) | |
Enusre public header and generated code have no implicit converion.
Diffstat (limited to 'src/google/protobuf/map_field_lite.h')
| -rw-r--r-- | src/google/protobuf/map_field_lite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/map_field_lite.h b/src/google/protobuf/map_field_lite.h index 2d102392..91de9627 100644 --- a/src/google/protobuf/map_field_lite.h +++ b/src/google/protobuf/map_field_lite.h @@ -60,7 +60,7 @@ class MapFieldLite { Map<Key, T>* MutableMap() { return &map_; } // Convenient methods for generated message implementation. - int size() const { return map_.size(); } + int size() const { return static_cast<int>(map_.size()); } void Clear() { return map_.clear(); } void MergeFrom(const MapFieldLite& other) { for (typename Map<Key, T>::const_iterator it = other.map_.begin(); |