diff options
| -rw-r--r-- | src/google/protobuf/descriptor.cc | 2 | ||||
| -rw-r--r-- | src/google/protobuf/extension_set.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc index f82a3450..a12e4e72 100644 --- a/src/google/protobuf/descriptor.cc +++ b/src/google/protobuf/descriptor.cc @@ -798,7 +798,7 @@ namespace { EncodedDescriptorDatabase* generated_database_ = NULL; DescriptorPool* generated_pool_ = NULL; -GoogleOnceType generated_pool_init_; +GOOGLE_PROTOBUF_DECLARE_ONCE(generated_pool_init_); void DeleteGeneratedPool() { delete generated_database_; diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc index 0f799a5b..4d5eb6cc 100644 --- a/src/google/protobuf/extension_set.cc +++ b/src/google/protobuf/extension_set.cc @@ -76,7 +76,7 @@ struct ExtensionInfo { typedef hash_map<pair<const MessageLite*, int>, ExtensionInfo> ExtensionRegistry; ExtensionRegistry* registry_ = NULL; -GoogleOnceType registry_init_; +GOOGLE_PROTOBUF_DECLARE_ONCE(registry_init_); void DeleteRegistry() { delete registry_; |