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

Add an intermediate method to propagate the friendship access to nested classes as a workaround for old compilers (e.g. gcc 3.4)

Browse Source
This commit is contained in:
liujisi@google.com 2011-02-07 19:03:53 +00:00
parent c345db7d6b
commit 17d57dbbcd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/google/protobuf/descriptor.cc
View File

@ -2160,6 +2160,11 @@ class DescriptorBuilder {
static inline bool get_is_placeholder(const Descriptor* descriptor) {
return descriptor->is_placeholder_;
}
static inline void assert_mutex_held(const DescriptorPool* pool) {
if (pool->mutex_ != NULL) {
pool->mutex_->AssertHeld();
}
}
// Must be run only after options have been interpreted.
//
@ -4338,9 +4343,7 @@ class DescriptorBuilder::OptionInterpreter::AggregateOptionFinder
virtual const FieldDescriptor* FindExtension(
Message* message, const string& name) const {
if (builder_->pool_->mutex_ != NULL) {
builder_->pool_->mutex_->AssertHeld();
}
assert_mutex_held(builder_->pool_);
Symbol result = builder_->LookupSymbolNoPlaceholder(
name, message->GetDescriptor()->full_name());
if (result.type == Symbol::FIELD &&