diff options
author | temporal <temporal@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-01 07:30:49 +0000 |
---|---|---|
committer | temporal <temporal@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-01 07:30:49 +0000 |
commit | f837b0066d7118c143c0301634e1d713bb1dc893 (patch) | |
tree | 058afb16b81f56dccaa84f293c0b772c23bdc82d /src/google/protobuf | |
parent | 9270a99d2e64d08a438729522330d1f1bd1e4716 (diff) | |
download | protobuf-f837b0066d7118c143c0301634e1d713bb1dc893.tar.gz protobuf-f837b0066d7118c143c0301634e1d713bb1dc893.tar.bz2 protobuf-f837b0066d7118c143c0301634e1d713bb1dc893.zip |
Use the nice macro to declare once-init control objects, like good little coders should. Otherwise the initialization routines never run on Mac. TODO: Investigate how this was broken.
Diffstat (limited to 'src/google/protobuf')
-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_; |