From 50ef6a623e02639fb8c252dfca67691f320e7349 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Wed, 13 Dec 2017 13:40:19 -0800 Subject: Avoid two consecutive underscores in macro name. Fixes https://github.com/google/protobuf/issues/3268 --- src/google/protobuf/compiler/cpp/cpp_file.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/google/protobuf/compiler') diff --git a/src/google/protobuf/compiler/cpp/cpp_file.cc b/src/google/protobuf/compiler/cpp/cpp_file.cc index 1f90ae43..a922ee97 100644 --- a/src/google/protobuf/compiler/cpp/cpp_file.cc +++ b/src/google/protobuf/compiler/cpp/cpp_file.cc @@ -1145,8 +1145,8 @@ void FileGenerator::GenerateTopHeaderGuard(io::Printer* printer, "// Generated by the protocol buffer compiler. DO NOT EDIT!\n" "// source: $filename$\n" "\n" - "#ifndef PROTOBUF_$filename_identifier$__INCLUDED\n" - "#define PROTOBUF_$filename_identifier$__INCLUDED\n" + "#ifndef PROTOBUF_$filename_identifier$_INCLUDED\n" + "#define PROTOBUF_$filename_identifier$_INCLUDED\n" "\n" "#include \n", "filename", file_->name(), "filename_identifier", filename_identifier); @@ -1156,7 +1156,7 @@ void FileGenerator::GenerateTopHeaderGuard(io::Printer* printer, void FileGenerator::GenerateBottomHeaderGuard( io::Printer* printer, const string& filename_identifier) { printer->Print( - "#endif // PROTOBUF_$filename_identifier$__INCLUDED\n", + "#endif // PROTOBUF_$filename_identifier$_INCLUDED\n", "filename_identifier", filename_identifier); } -- cgit v1.2.3 From b3ac4417b735f73207938c09c41de15608fac48a Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Wed, 13 Dec 2017 13:49:26 -0800 Subject: Update generated code. --- src/google/protobuf/any.pb.h | 6 +++--- src/google/protobuf/api.pb.h | 6 +++--- src/google/protobuf/compiler/plugin.pb.h | 6 +++--- src/google/protobuf/descriptor.pb.h | 6 +++--- src/google/protobuf/duration.pb.h | 6 +++--- src/google/protobuf/empty.pb.h | 6 +++--- src/google/protobuf/field_mask.pb.h | 6 +++--- src/google/protobuf/source_context.pb.h | 6 +++--- src/google/protobuf/struct.pb.h | 6 +++--- src/google/protobuf/timestamp.pb.h | 6 +++--- src/google/protobuf/type.pb.h | 6 +++--- src/google/protobuf/wrappers.pb.h | 6 +++--- 12 files changed, 36 insertions(+), 36 deletions(-) (limited to 'src/google/protobuf/compiler') diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 673d335a..40890d41 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/any.proto -#ifndef PROTOBUF_google_2fprotobuf_2fany_2eproto__INCLUDED -#define PROTOBUF_google_2fprotobuf_2fany_2eproto__INCLUDED +#ifndef PROTOBUF_google_2fprotobuf_2fany_2eproto_INCLUDED +#define PROTOBUF_google_2fprotobuf_2fany_2eproto_INCLUDED #include @@ -329,4 +329,4 @@ inline void Any::set_allocated_value(::std::string* value) { // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_google_2fprotobuf_2fany_2eproto__INCLUDED +#endif // PROTOBUF_google_2fprotobuf_2fany_2eproto_INCLUDED diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index ffcba0fd..b329e1ae 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/api.proto -#ifndef PROTOBUF_google_2fprotobuf_2fapi_2eproto__INCLUDED -#define PROTOBUF_google_2fprotobuf_2fapi_2eproto__INCLUDED +#ifndef PROTOBUF_google_2fprotobuf_2fapi_2eproto_INCLUDED +#define PROTOBUF_google_2fprotobuf_2fapi_2eproto_INCLUDED #include @@ -1182,4 +1182,4 @@ inline void Mixin::set_allocated_root(::std::string* root) { // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_google_2fprotobuf_2fapi_2eproto__INCLUDED +#endif // PROTOBUF_google_2fprotobuf_2fapi_2eproto_INCLUDED diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 9618ec00..1fb3061a 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/compiler/plugin.proto -#ifndef PROTOBUF_google_2fprotobuf_2fcompiler_2fplugin_2eproto__INCLUDED -#define PROTOBUF_google_2fprotobuf_2fcompiler_2fplugin_2eproto__INCLUDED +#ifndef PROTOBUF_google_2fprotobuf_2fcompiler_2fplugin_2eproto_INCLUDED +#define PROTOBUF_google_2fprotobuf_2fcompiler_2fplugin_2eproto_INCLUDED #include @@ -1383,4 +1383,4 @@ CodeGeneratorResponse::file() const { // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_google_2fprotobuf_2fcompiler_2fplugin_2eproto__INCLUDED +#endif // PROTOBUF_google_2fprotobuf_2fcompiler_2fplugin_2eproto_INCLUDED diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 3f964afe..ae71d619 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/descriptor.proto -#ifndef PROTOBUF_google_2fprotobuf_2fdescriptor_2eproto__INCLUDED -#define PROTOBUF_google_2fprotobuf_2fdescriptor_2eproto__INCLUDED +#ifndef PROTOBUF_google_2fprotobuf_2fdescriptor_2eproto_INCLUDED +#define PROTOBUF_google_2fprotobuf_2fdescriptor_2eproto_INCLUDED #include @@ -11613,4 +11613,4 @@ inline const EnumDescriptor* GetEnumDescriptor< ::google::protobuf::MethodOption // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_google_2fprotobuf_2fdescriptor_2eproto__INCLUDED +#endif // PROTOBUF_google_2fprotobuf_2fdescriptor_2eproto_INCLUDED diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index bc1a043e..376b28f3 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/duration.proto -#ifndef PROTOBUF_google_2fprotobuf_2fduration_2eproto__INCLUDED -#define PROTOBUF_google_2fprotobuf_2fduration_2eproto__INCLUDED +#ifndef PROTOBUF_google_2fprotobuf_2fduration_2eproto_INCLUDED +#define PROTOBUF_google_2fprotobuf_2fduration_2eproto_INCLUDED #include @@ -238,4 +238,4 @@ inline void Duration::set_nanos(::google::protobuf::int32 value) { // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_google_2fprotobuf_2fduration_2eproto__INCLUDED +#endif // PROTOBUF_google_2fprotobuf_2fduration_2eproto_INCLUDED diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 88be1475..505fc3c0 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/empty.proto -#ifndef PROTOBUF_google_2fprotobuf_2fempty_2eproto__INCLUDED -#define PROTOBUF_google_2fprotobuf_2fempty_2eproto__INCLUDED +#ifndef PROTOBUF_google_2fprotobuf_2fempty_2eproto_INCLUDED +#define PROTOBUF_google_2fprotobuf_2fempty_2eproto_INCLUDED #include @@ -196,4 +196,4 @@ class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message /* @@protoc_ // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_google_2fprotobuf_2fempty_2eproto__INCLUDED +#endif // PROTOBUF_google_2fprotobuf_2fempty_2eproto_INCLUDED diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 76be06a7..8773499d 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/field_mask.proto -#ifndef PROTOBUF_google_2fprotobuf_2ffield_5fmask_2eproto__INCLUDED -#define PROTOBUF_google_2fprotobuf_2ffield_5fmask_2eproto__INCLUDED +#ifndef PROTOBUF_google_2fprotobuf_2ffield_5fmask_2eproto_INCLUDED +#define PROTOBUF_google_2fprotobuf_2ffield_5fmask_2eproto_INCLUDED #include @@ -273,4 +273,4 @@ FieldMask::mutable_paths() { // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_google_2fprotobuf_2ffield_5fmask_2eproto__INCLUDED +#endif // PROTOBUF_google_2fprotobuf_2ffield_5fmask_2eproto_INCLUDED diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index 9f8255cd..c974ea89 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/source_context.proto -#ifndef PROTOBUF_google_2fprotobuf_2fsource_5fcontext_2eproto__INCLUDED -#define PROTOBUF_google_2fprotobuf_2fsource_5fcontext_2eproto__INCLUDED +#ifndef PROTOBUF_google_2fprotobuf_2fsource_5fcontext_2eproto_INCLUDED +#define PROTOBUF_google_2fprotobuf_2fsource_5fcontext_2eproto_INCLUDED #include @@ -249,4 +249,4 @@ inline void SourceContext::set_allocated_file_name(::std::string* file_name) { // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_google_2fprotobuf_2fsource_5fcontext_2eproto__INCLUDED +#endif // PROTOBUF_google_2fprotobuf_2fsource_5fcontext_2eproto_INCLUDED diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index ada1a189..8f1b064d 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/struct.proto -#ifndef PROTOBUF_google_2fprotobuf_2fstruct_2eproto__INCLUDED -#define PROTOBUF_google_2fprotobuf_2fstruct_2eproto__INCLUDED +#ifndef PROTOBUF_google_2fprotobuf_2fstruct_2eproto_INCLUDED +#define PROTOBUF_google_2fprotobuf_2fstruct_2eproto_INCLUDED #include @@ -1039,4 +1039,4 @@ inline const EnumDescriptor* GetEnumDescriptor< ::google::protobuf::NullValue>() // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_google_2fprotobuf_2fstruct_2eproto__INCLUDED +#endif // PROTOBUF_google_2fprotobuf_2fstruct_2eproto_INCLUDED diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 31936ff2..8e5911fe 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/timestamp.proto -#ifndef PROTOBUF_google_2fprotobuf_2ftimestamp_2eproto__INCLUDED -#define PROTOBUF_google_2fprotobuf_2ftimestamp_2eproto__INCLUDED +#ifndef PROTOBUF_google_2fprotobuf_2ftimestamp_2eproto_INCLUDED +#define PROTOBUF_google_2fprotobuf_2ftimestamp_2eproto_INCLUDED #include @@ -238,4 +238,4 @@ inline void Timestamp::set_nanos(::google::protobuf::int32 value) { // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_google_2fprotobuf_2ftimestamp_2eproto__INCLUDED +#endif // PROTOBUF_google_2fprotobuf_2ftimestamp_2eproto_INCLUDED diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 7a2135c4..c5e800c3 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/type.proto -#ifndef PROTOBUF_google_2fprotobuf_2ftype_2eproto__INCLUDED -#define PROTOBUF_google_2fprotobuf_2ftype_2eproto__INCLUDED +#ifndef PROTOBUF_google_2fprotobuf_2ftype_2eproto_INCLUDED +#define PROTOBUF_google_2fprotobuf_2ftype_2eproto_INCLUDED #include @@ -2403,4 +2403,4 @@ inline const EnumDescriptor* GetEnumDescriptor< ::google::protobuf::Syntax>() { // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_google_2fprotobuf_2ftype_2eproto__INCLUDED +#endif // PROTOBUF_google_2fprotobuf_2ftype_2eproto_INCLUDED diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 18c7a2cd..e533ca1d 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/wrappers.proto -#ifndef PROTOBUF_google_2fprotobuf_2fwrappers_2eproto__INCLUDED -#define PROTOBUF_google_2fprotobuf_2fwrappers_2eproto__INCLUDED +#ifndef PROTOBUF_google_2fprotobuf_2fwrappers_2eproto_INCLUDED +#define PROTOBUF_google_2fprotobuf_2fwrappers_2eproto_INCLUDED #include @@ -1533,4 +1533,4 @@ inline void BytesValue::unsafe_arena_set_allocated_value( // @@protoc_insertion_point(global_scope) -#endif // PROTOBUF_google_2fprotobuf_2fwrappers_2eproto__INCLUDED +#endif // PROTOBUF_google_2fprotobuf_2fwrappers_2eproto_INCLUDED -- cgit v1.2.3