From f837b0066d7118c143c0301634e1d713bb1dc893 Mon Sep 17 00:00:00 2001
From: temporal <temporal@630680e5-0e50-0410-840e-4b1c322b438d>
Date: Sat, 1 Aug 2009 07:30:49 +0000
Subject: 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.

---
 src/google/protobuf/descriptor.cc    | 2 +-
 src/google/protobuf/extension_set.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/google')

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_;
-- 
cgit v1.2.3