aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar pliard@google.com <pliard@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2012-05-10 08:04:04 +0000
committerGravatar pliard@google.com <pliard@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2012-05-10 08:04:04 +0000
commita269a2c48bf8d6c1b0ed88e66beff4577c764739 (patch)
tree6a7cb0d116bed75eff961d2ef9070f706996ceea
parent6103d4ed13d21e96cb0989fa7d38d83061da0281 (diff)
Update outdated use of GoogleOnceType.
-rw-r--r--src/google/protobuf/compiler/cpp/cpp_file.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_file.cc b/src/google/protobuf/compiler/cpp/cpp_file.cc
index f4930610..b8e7708f 100644
--- a/src/google/protobuf/compiler/cpp/cpp_file.cc
+++ b/src/google/protobuf/compiler/cpp/cpp_file.cc
@@ -592,8 +592,7 @@ void FileGenerator::GenerateBuildDescriptors(io::Printer* printer) {
" }\n"
"} static_descriptor_initializer_$filename$_;\n",
// Without.
- "::google::protobuf::GoogleOnceType $adddescriptorsname$_once_ =\n"
- " GOOGLE_PROTOBUF_ONCE_INIT;\n"
+ "GOOGLE_PROTOBUF_DECLARE_ONCE($adddescriptorsname$_once_);\n"
"void $adddescriptorsname$() {\n"
" ::google::protobuf::GoogleOnceInit(&$adddescriptorsname$_once_,\n"
" &$adddescriptorsname$_impl);\n"