Index: third_party/protobuf/src/google/protobuf/extension_set.cc |
diff --git a/third_party/protobuf/src/google/protobuf/extension_set.cc b/third_party/protobuf/src/google/protobuf/extension_set.cc |
index 955c079bddcd92d7c41669996f37be2885ea01ce..9afb236147c0cfd60c4d60b5d3bd55a833052161 100644 |
--- a/third_party/protobuf/src/google/protobuf/extension_set.cc |
+++ b/third_party/protobuf/src/google/protobuf/extension_set.cc |
@@ -76,7 +76,7 @@ inline bool is_packable(WireFormatLite::WireType type) { |
} |
// Registry stuff. |
-typedef hash_map<std::pair<const MessageLite*, int>, |
+typedef hash_map<pair<const MessageLite*, int>, |
ExtensionInfo> ExtensionRegistry; |
ExtensionRegistry* registry_ = NULL; |
GOOGLE_PROTOBUF_DECLARE_ONCE(registry_init_); |
@@ -177,8 +177,7 @@ void ExtensionSet::RegisterMessageExtension(const MessageLite* containing_type, |
// =================================================================== |
// Constructors and basic methods. |
-ExtensionSet::ExtensionSet(::google::protobuf::Arena* arena) |
- : arena_(arena) { |
+ExtensionSet::ExtensionSet(::google::protobuf::Arena* arena) : arena_(arena) { |
if (arena_ != NULL) { |
arena_->OwnDestructor(&extensions_); |
} |
@@ -189,7 +188,7 @@ ExtensionSet::ExtensionSet() : arena_(NULL) {} |
ExtensionSet::~ExtensionSet() { |
// Deletes all allocated extensions. |
if (arena_ == NULL) { |
- for (ExtensionMap::iterator iter = extensions_.begin(); |
+ for (map<int, Extension>::iterator iter = extensions_.begin(); |
iter != extensions_.end(); ++iter) { |
iter->second.Free(); |
} |
@@ -202,7 +201,7 @@ ExtensionSet::~ExtensionSet() { |
// vector<const FieldDescriptor*>* output) const |
bool ExtensionSet::Has(int number) const { |
- ExtensionMap::const_iterator iter = extensions_.find(number); |
+ map<int, Extension>::const_iterator iter = extensions_.find(number); |
if (iter == extensions_.end()) return false; |
GOOGLE_DCHECK(!iter->second.is_repeated); |
return !iter->second.is_cleared; |
@@ -210,7 +209,7 @@ bool ExtensionSet::Has(int number) const { |
int ExtensionSet::NumExtensions() const { |
int result = 0; |
- for (ExtensionMap::const_iterator iter = extensions_.begin(); |
+ for (map<int, Extension>::const_iterator iter = extensions_.begin(); |
iter != extensions_.end(); ++iter) { |
if (!iter->second.is_cleared) { |
++result; |
@@ -220,13 +219,13 @@ int ExtensionSet::NumExtensions() const { |
} |
int ExtensionSet::ExtensionSize(int number) const { |
- ExtensionMap::const_iterator iter = extensions_.find(number); |
+ map<int, Extension>::const_iterator iter = extensions_.find(number); |
if (iter == extensions_.end()) return false; |
return iter->second.GetSize(); |
} |
FieldType ExtensionSet::ExtensionType(int number) const { |
- ExtensionMap::const_iterator iter = extensions_.find(number); |
+ map<int, Extension>::const_iterator iter = extensions_.find(number); |
if (iter == extensions_.end()) { |
GOOGLE_LOG(DFATAL) << "Don't lookup extension types if they aren't present (1). "; |
return 0; |
@@ -238,7 +237,7 @@ FieldType ExtensionSet::ExtensionType(int number) const { |
} |
void ExtensionSet::ClearExtension(int number) { |
- ExtensionMap::iterator iter = extensions_.find(number); |
+ map<int, Extension>::iterator iter = extensions_.find(number); |
if (iter == extensions_.end()) return; |
iter->second.Clear(); |
} |
@@ -266,7 +265,7 @@ enum Cardinality { |
\ |
LOWERCASE ExtensionSet::Get##CAMELCASE(int number, \ |
LOWERCASE default_value) const { \ |
- ExtensionMap::const_iterator iter = extensions_.find(number); \ |
+ map<int, Extension>::const_iterator iter = extensions_.find(number); \ |
if (iter == extensions_.end() || iter->second.is_cleared) { \ |
return default_value; \ |
} else { \ |
@@ -291,7 +290,7 @@ void ExtensionSet::Set##CAMELCASE(int number, FieldType type, \ |
} \ |
\ |
LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \ |
- ExtensionMap::const_iterator iter = extensions_.find(number); \ |
+ map<int, Extension>::const_iterator iter = extensions_.find(number); \ |
GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \ |
GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \ |
return iter->second.repeated_##LOWERCASE##_value->Get(index); \ |
@@ -299,7 +298,7 @@ LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index) const { \ |
\ |
void ExtensionSet::SetRepeated##CAMELCASE( \ |
int number, int index, LOWERCASE value) { \ |
- ExtensionMap::iterator iter = extensions_.find(number); \ |
+ map<int, Extension>::iterator iter = extensions_.find(number); \ |
GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; \ |
GOOGLE_DCHECK_TYPE(iter->second, REPEATED, UPPERCASE); \ |
iter->second.repeated_##LOWERCASE##_value->Set(index, value); \ |
@@ -335,7 +334,7 @@ PRIMITIVE_ACCESSORS( BOOL, bool, Bool) |
const void* ExtensionSet::GetRawRepeatedField(int number, |
const void* default_value) const { |
- ExtensionMap::const_iterator iter = extensions_.find(number); |
+ map<int, Extension>::const_iterator iter = extensions_.find(number); |
if (iter == extensions_.end()) { |
return default_value; |
} |
@@ -409,7 +408,7 @@ void* ExtensionSet::MutableRawRepeatedField(int number, FieldType field_type, |
// Compatible version using old call signature. Does not create extensions when |
// the don't already exist; instead, just GOOGLE_CHECK-fails. |
void* ExtensionSet::MutableRawRepeatedField(int number) { |
- ExtensionMap::iterator iter = extensions_.find(number); |
+ map<int, Extension>::iterator iter = extensions_.find(number); |
GOOGLE_CHECK(iter == extensions_.end()) << "Extension not found."; |
// We assume that all the RepeatedField<>* pointers have the same |
// size and alignment within the anonymous union in Extension. |
@@ -421,7 +420,7 @@ void* ExtensionSet::MutableRawRepeatedField(int number) { |
// Enums |
int ExtensionSet::GetEnum(int number, int default_value) const { |
- ExtensionMap::const_iterator iter = extensions_.find(number); |
+ map<int, Extension>::const_iterator iter = extensions_.find(number); |
if (iter == extensions_.end() || iter->second.is_cleared) { |
// Not present. Return the default value. |
return default_value; |
@@ -446,14 +445,14 @@ void ExtensionSet::SetEnum(int number, FieldType type, int value, |
} |
int ExtensionSet::GetRepeatedEnum(int number, int index) const { |
- ExtensionMap::const_iterator iter = extensions_.find(number); |
+ map<int, Extension>::const_iterator iter = extensions_.find(number); |
GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; |
GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM); |
return iter->second.repeated_enum_value->Get(index); |
} |
void ExtensionSet::SetRepeatedEnum(int number, int index, int value) { |
- ExtensionMap::iterator iter = extensions_.find(number); |
+ map<int, Extension>::iterator iter = extensions_.find(number); |
GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; |
GOOGLE_DCHECK_TYPE(iter->second, REPEATED, ENUM); |
iter->second.repeated_enum_value->Set(index, value); |
@@ -482,7 +481,7 @@ void ExtensionSet::AddEnum(int number, FieldType type, |
const string& ExtensionSet::GetString(int number, |
const string& default_value) const { |
- ExtensionMap::const_iterator iter = extensions_.find(number); |
+ map<int, Extension>::const_iterator iter = extensions_.find(number); |
if (iter == extensions_.end() || iter->second.is_cleared) { |
// Not present. Return the default value. |
return default_value; |
@@ -508,14 +507,14 @@ string* ExtensionSet::MutableString(int number, FieldType type, |
} |
const string& ExtensionSet::GetRepeatedString(int number, int index) const { |
- ExtensionMap::const_iterator iter = extensions_.find(number); |
+ map<int, Extension>::const_iterator iter = extensions_.find(number); |
GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; |
GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING); |
return iter->second.repeated_string_value->Get(index); |
} |
string* ExtensionSet::MutableRepeatedString(int number, int index) { |
- ExtensionMap::iterator iter = extensions_.find(number); |
+ map<int, Extension>::iterator iter = extensions_.find(number); |
GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; |
GOOGLE_DCHECK_TYPE(iter->second, REPEATED, STRING); |
return iter->second.repeated_string_value->Mutable(index); |
@@ -542,7 +541,7 @@ string* ExtensionSet::AddString(int number, FieldType type, |
const MessageLite& ExtensionSet::GetMessage( |
int number, const MessageLite& default_value) const { |
- ExtensionMap::const_iterator iter = extensions_.find(number); |
+ map<int, Extension>::const_iterator iter = extensions_.find(number); |
if (iter == extensions_.end()) { |
// Not present. Return the default value. |
return default_value; |
@@ -665,7 +664,7 @@ void ExtensionSet::UnsafeArenaSetAllocatedMessage( |
MessageLite* ExtensionSet::ReleaseMessage(int number, |
const MessageLite& prototype) { |
- ExtensionMap::iterator iter = extensions_.find(number); |
+ map<int, Extension>::iterator iter = extensions_.find(number); |
if (iter == extensions_.end()) { |
// Not present. Return NULL. |
return NULL; |
@@ -694,7 +693,7 @@ MessageLite* ExtensionSet::ReleaseMessage(int number, |
MessageLite* ExtensionSet::UnsafeArenaReleaseMessage( |
int number, const MessageLite& prototype) { |
- ExtensionMap::iterator iter = extensions_.find(number); |
+ map<int, Extension>::iterator iter = extensions_.find(number); |
if (iter == extensions_.end()) { |
// Not present. Return NULL. |
return NULL; |
@@ -721,14 +720,14 @@ MessageLite* ExtensionSet::UnsafeArenaReleaseMessage( |
const MessageLite& ExtensionSet::GetRepeatedMessage( |
int number, int index) const { |
- ExtensionMap::const_iterator iter = extensions_.find(number); |
+ map<int, Extension>::const_iterator iter = extensions_.find(number); |
GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; |
GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE); |
return iter->second.repeated_message_value->Get(index); |
} |
MessageLite* ExtensionSet::MutableRepeatedMessage(int number, int index) { |
- ExtensionMap::iterator iter = extensions_.find(number); |
+ map<int, Extension>::iterator iter = extensions_.find(number); |
GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; |
GOOGLE_DCHECK_TYPE(iter->second, REPEATED, MESSAGE); |
return iter->second.repeated_message_value->Mutable(index); |
@@ -767,7 +766,7 @@ MessageLite* ExtensionSet::AddMessage(int number, FieldType type, |
#undef GOOGLE_DCHECK_TYPE |
void ExtensionSet::RemoveLast(int number) { |
- ExtensionMap::iterator iter = extensions_.find(number); |
+ map<int, Extension>::iterator iter = extensions_.find(number); |
GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; |
Extension* extension = &iter->second; |
@@ -808,7 +807,7 @@ void ExtensionSet::RemoveLast(int number) { |
} |
MessageLite* ExtensionSet::ReleaseLast(int number) { |
- ExtensionMap::iterator iter = extensions_.find(number); |
+ map<int, Extension>::iterator iter = extensions_.find(number); |
GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; |
Extension* extension = &iter->second; |
@@ -818,7 +817,7 @@ MessageLite* ExtensionSet::ReleaseLast(int number) { |
} |
void ExtensionSet::SwapElements(int number, int index1, int index2) { |
- ExtensionMap::iterator iter = extensions_.find(number); |
+ map<int, Extension>::iterator iter = extensions_.find(number); |
GOOGLE_CHECK(iter != extensions_.end()) << "Index out-of-bounds (field is empty)."; |
Extension* extension = &iter->second; |
@@ -861,14 +860,14 @@ void ExtensionSet::SwapElements(int number, int index1, int index2) { |
// =================================================================== |
void ExtensionSet::Clear() { |
- for (ExtensionMap::iterator iter = extensions_.begin(); |
+ for (map<int, Extension>::iterator iter = extensions_.begin(); |
iter != extensions_.end(); ++iter) { |
iter->second.Clear(); |
} |
} |
void ExtensionSet::MergeFrom(const ExtensionSet& other) { |
- for (ExtensionMap::const_iterator iter = other.extensions_.begin(); |
+ for (map<int, Extension>::const_iterator iter = other.extensions_.begin(); |
iter != other.extensions_.end(); ++iter) { |
const Extension& other_extension = iter->second; |
InternalExtensionMergeFrom(iter->first, other_extension); |
@@ -1032,8 +1031,8 @@ void ExtensionSet::Swap(ExtensionSet* x) { |
void ExtensionSet::SwapExtension(ExtensionSet* other, |
int number) { |
if (this == other) return; |
- ExtensionMap::iterator this_iter = extensions_.find(number); |
- ExtensionMap::iterator other_iter = other->extensions_.find(number); |
+ map<int, Extension>::iterator this_iter = extensions_.find(number); |
+ map<int, Extension>::iterator other_iter = other->extensions_.find(number); |
if (this_iter == extensions_.end() && |
other_iter == other->extensions_.end()) { |
@@ -1053,7 +1052,7 @@ void ExtensionSet::SwapExtension(ExtensionSet* other, |
// implemented in ExtensionSet's MergeFrom. |
ExtensionSet temp; |
temp.InternalExtensionMergeFrom(number, other_iter->second); |
- ExtensionMap::iterator temp_iter = temp.extensions_.find(number); |
+ map<int, Extension>::iterator temp_iter = temp.extensions_.find(number); |
other_iter->second.Clear(); |
other->InternalExtensionMergeFrom(number, this_iter->second); |
this_iter->second.Clear(); |
@@ -1086,7 +1085,7 @@ void ExtensionSet::SwapExtension(ExtensionSet* other, |
bool ExtensionSet::IsInitialized() const { |
// Extensions are never required. However, we need to check that all |
// embedded messages are initialized. |
- for (ExtensionMap::const_iterator iter = extensions_.begin(); |
+ for (map<int, Extension>::const_iterator iter = extensions_.begin(); |
iter != extensions_.end(); ++iter) { |
const Extension& extension = iter->second; |
if (cpp_type(extension.type) == WireFormatLite::CPPTYPE_MESSAGE) { |
@@ -1346,7 +1345,7 @@ bool ExtensionSet::ParseField(uint32 tag, io::CodedInputStream* input, |
void ExtensionSet::SerializeWithCachedSizes( |
int start_field_number, int end_field_number, |
io::CodedOutputStream* output) const { |
- ExtensionMap::const_iterator iter; |
+ map<int, Extension>::const_iterator iter; |
for (iter = extensions_.lower_bound(start_field_number); |
iter != extensions_.end() && iter->first < end_field_number; |
++iter) { |
@@ -1354,10 +1353,10 @@ void ExtensionSet::SerializeWithCachedSizes( |
} |
} |
-size_t ExtensionSet::ByteSize() const { |
- size_t total_size = 0; |
+int ExtensionSet::ByteSize() const { |
+ int total_size = 0; |
- for (ExtensionMap::const_iterator iter = extensions_.begin(); |
+ for (map<int, Extension>::const_iterator iter = extensions_.begin(); |
iter != extensions_.end(); ++iter) { |
total_size += iter->second.ByteSize(iter->first); |
} |
@@ -1371,7 +1370,7 @@ size_t ExtensionSet::ByteSize() const { |
bool ExtensionSet::MaybeNewExtension(int number, |
const FieldDescriptor* descriptor, |
Extension** result) { |
- std::pair<ExtensionMap::iterator, bool> insert_result = |
+ pair<map<int, Extension>::iterator, bool> insert_result = |
extensions_.insert(std::make_pair(number, Extension())); |
*result = &insert_result.first->second; |
(*result)->descriptor = descriptor; |
@@ -1536,8 +1535,8 @@ void ExtensionSet::Extension::SerializeFieldWithCachedSizes( |
} |
} |
-size_t ExtensionSet::Extension::ByteSize(int number) const { |
- size_t result = 0; |
+int ExtensionSet::Extension::ByteSize(int number) const { |
+ int result = 0; |
if (is_repeated) { |
if (is_packed) { |
@@ -1563,7 +1562,7 @@ size_t ExtensionSet::Extension::ByteSize(int number) const { |
#define HANDLE_TYPE(UPPERCASE, CAMELCASE, LOWERCASE) \ |
case WireFormatLite::TYPE_##UPPERCASE: \ |
result += WireFormatLite::k##CAMELCASE##Size * \ |
- FromIntSize(repeated_##LOWERCASE##_value->size()); \ |
+ repeated_##LOWERCASE##_value->size(); \ |
break |
HANDLE_TYPE( FIXED32, Fixed32, uint32); |
HANDLE_TYPE( FIXED64, Fixed64, uint64); |
@@ -1582,7 +1581,7 @@ size_t ExtensionSet::Extension::ByteSize(int number) const { |
break; |
} |
- cached_size = ToCachedSize(result); |
+ cached_size = result; |
if (result > 0) { |
result += io::CodedOutputStream::VarintSize32(result); |
result += io::CodedOutputStream::VarintSize32( |
@@ -1590,13 +1589,12 @@ size_t ExtensionSet::Extension::ByteSize(int number) const { |
WireFormatLite::WIRETYPE_LENGTH_DELIMITED)); |
} |
} else { |
- size_t tag_size = WireFormatLite::TagSize(number, real_type(type)); |
+ int tag_size = WireFormatLite::TagSize(number, real_type(type)); |
switch (real_type(type)) { |
#define HANDLE_TYPE(UPPERCASE, CAMELCASE, LOWERCASE) \ |
case WireFormatLite::TYPE_##UPPERCASE: \ |
- result += tag_size * \ |
- FromIntSize(repeated_##LOWERCASE##_value->size()); \ |
+ result += tag_size * repeated_##LOWERCASE##_value->size(); \ |
for (int i = 0; i < repeated_##LOWERCASE##_value->size(); i++) { \ |
result += WireFormatLite::CAMELCASE##Size( \ |
repeated_##LOWERCASE##_value->Get(i)); \ |
@@ -1620,7 +1618,7 @@ size_t ExtensionSet::Extension::ByteSize(int number) const { |
#define HANDLE_TYPE(UPPERCASE, CAMELCASE, LOWERCASE) \ |
case WireFormatLite::TYPE_##UPPERCASE: \ |
result += (tag_size + WireFormatLite::k##CAMELCASE##Size) * \ |
- FromIntSize(repeated_##LOWERCASE##_value->size()); \ |
+ repeated_##LOWERCASE##_value->size(); \ |
break |
HANDLE_TYPE( FIXED32, Fixed32, uint32); |
HANDLE_TYPE( FIXED64, Fixed64, uint64); |
@@ -1653,7 +1651,7 @@ size_t ExtensionSet::Extension::ByteSize(int number) const { |
#undef HANDLE_TYPE |
case WireFormatLite::TYPE_MESSAGE: { |
if (is_lazy) { |
- size_t size = lazymessage_value->ByteSize(); |
+ int size = lazymessage_value->ByteSize(); |
result += io::CodedOutputStream::VarintSize32(size) + size; |
} else { |
result += WireFormatLite::MessageSize(*message_value); |