diff options
author | Adam Cozzette <acozzette@gmail.com> | 2018-07-09 11:45:39 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-09 11:45:39 -0700 |
commit | 4129b6aaad1aa9d48dea1b4ad64c2a64747cb537 (patch) | |
tree | 528cf866e94f2dcc3e55d45dce3cf42ef60848bc /src/google/protobuf/generated_message_reflection.cc | |
parent | 61476b8e74357ea875f71bb321874ca4530b7d50 (diff) | |
parent | e1845779ed1115dd61eb2a3b8f0a78c252ca5b2b (diff) |
Merge pull request #4882 from google/3.6.x
Merge 3.6.x into master
Diffstat (limited to 'src/google/protobuf/generated_message_reflection.cc')
-rw-r--r-- | src/google/protobuf/generated_message_reflection.cc | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc index 247f772c..74ad00e7 100644 --- a/src/google/protobuf/generated_message_reflection.cc +++ b/src/google/protobuf/generated_message_reflection.cc @@ -2327,32 +2327,26 @@ class AssignDescriptorsHelper { // automatically delete the allocated reflection. MetadataOwner owns // all the allocated reflection instances. struct MetadataOwner { + ~MetadataOwner() { + for (auto range : metadata_arrays_) { + for (const Metadata* m = range.first; m < range.second; m++) { + delete m->reflection; + } + } + } + void AddArray(const Metadata* begin, const Metadata* end) { MutexLock lock(&mu_); metadata_arrays_.push_back(std::make_pair(begin, end)); } static MetadataOwner* Instance() { - static MetadataOwner* res = new MetadataOwner; + static MetadataOwner* res = OnShutdownDelete(new MetadataOwner); return res; } private: - // Use the constructor to register the shutdown code. Because c++ makes sure - // this called only once. - MetadataOwner() { OnShutdown(&DeleteMetadata); } - ~MetadataOwner() { - for (int i = 0; i < metadata_arrays_.size(); i++) { - for (const Metadata* m = metadata_arrays_[i].first; - m < metadata_arrays_[i].second; m++) { - delete m->reflection; - } - } - } - - static void DeleteMetadata() { - delete Instance(); - } + MetadataOwner() = default; // private because singleton Mutex mu_; std::vector<std::pair<const Metadata*, const Metadata*> > metadata_arrays_; |