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/message.cc | |
parent | 61476b8e74357ea875f71bb321874ca4530b7d50 (diff) | |
parent | e1845779ed1115dd61eb2a3b8f0a78c252ca5b2b (diff) | |
download | protobuf-4129b6aaad1aa9d48dea1b4ad64c2a64747cb537.tar.gz protobuf-4129b6aaad1aa9d48dea1b4ad64c2a64747cb537.tar.bz2 protobuf-4129b6aaad1aa9d48dea1b4ad64c2a64747cb537.zip |
Merge pull request #4882 from google/3.6.x
Merge 3.6.x into master
Diffstat (limited to 'src/google/protobuf/message.cc')
-rw-r--r-- | src/google/protobuf/message.cc | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc index 7fda0c79..a536615a 100644 --- a/src/google/protobuf/message.cc +++ b/src/google/protobuf/message.cc @@ -262,9 +262,6 @@ namespace { class GeneratedMessageFactory : public MessageFactory { public: - GeneratedMessageFactory(); - ~GeneratedMessageFactory(); - static GeneratedMessageFactory* singleton(); typedef void RegistrationFunc(const string&); @@ -284,25 +281,9 @@ class GeneratedMessageFactory : public MessageFactory { hash_map<const Descriptor*, const Message*> type_map_; }; -GeneratedMessageFactory* generated_message_factory_ = NULL; -GOOGLE_PROTOBUF_DECLARE_ONCE(generated_message_factory_once_init_); - -void ShutdownGeneratedMessageFactory() { - delete generated_message_factory_; -} - -void InitGeneratedMessageFactory() { - generated_message_factory_ = new GeneratedMessageFactory; - internal::OnShutdown(&ShutdownGeneratedMessageFactory); -} - -GeneratedMessageFactory::GeneratedMessageFactory() {} -GeneratedMessageFactory::~GeneratedMessageFactory() {} - GeneratedMessageFactory* GeneratedMessageFactory::singleton() { - ::google::protobuf::GoogleOnceInit(&generated_message_factory_once_init_, - &InitGeneratedMessageFactory); - return generated_message_factory_; + static auto instance = internal::OnShutdownDelete(new GeneratedMessageFactory); + return instance; } void GeneratedMessageFactory::RegisterFile( |