From baae7ea12b8e41a478d7cf987a2218734e5a7722 Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Thu, 31 Aug 2017 10:49:58 -0700 Subject: Add @Deprecated annotation support for proto file. --- src/google/protobuf/compiler/java/java_file.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/google') diff --git a/src/google/protobuf/compiler/java/java_file.cc b/src/google/protobuf/compiler/java/java_file.cc index 2d5465ba..21133a15 100644 --- a/src/google/protobuf/compiler/java/java_file.cc +++ b/src/google/protobuf/compiler/java/java_file.cc @@ -248,9 +248,12 @@ void FileGenerator::Generate(io::Printer* printer) { PrintGeneratedAnnotation( printer, '$', options_.annotate_code ? classname_ + ".java.pb.meta" : ""); printer->Print( - "public final class $classname$ {\n" + "$deprecation$public final class $classname$ {\n" " private $ctor$() {}\n", - "classname", classname_, "ctor", classname_); + "deprecation", file_->options().deprecated() ? + "@java.lang.Deprecated " : "", + "classname", classname_, + "ctor", classname_); printer->Annotate("classname", file_->name()); printer->Indent(); -- cgit v1.2.3 From e3be1febf227647ec8b54f939b07a43d60450e91 Mon Sep 17 00:00:00 2001 From: drivehappy Date: Wed, 13 Sep 2017 16:10:35 -0700 Subject: Clang warning cleanup for unused parameter. --- src/google/protobuf/arena.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/google') diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h index f8a94705..78e8d902 100644 --- a/src/google/protobuf/arena.h +++ b/src/google/protobuf/arena.h @@ -853,7 +853,7 @@ class LIBPROTOBUF_EXPORT Arena { template GOOGLE_ATTRIBUTE_ALWAYS_INLINE static ::google::protobuf::Arena* GetArenaInternal( - const T* value, google::protobuf::internal::false_type) { + const T* /* value */, google::protobuf::internal::false_type) { return NULL; } -- cgit v1.2.3