commit 74cea8368d00ed222b5afee4022208022918eb8f
author Jakob Buchgraber <buchgr@google.com> Mon May 29 09:56:22 2017 +0200
committer Jakob Buchgraber <buchgr@google.com> Wed May 31 12:54:52 2017 +0200
tree 3b9b88ef623a5d4330936b348995b3bac1ea48aa
parent c3cf7d917afd02d71de3800cd46ad8d14f1ddf55

Update grpc-java to 1.3.0, netty to 4.1.8.Final

Change-Id: I24e44ce87f5e042ddddb4cdbdcdd118a2d30a5eb

third_party/grpc/compiler/src/java_plugin/cpp/java_plugin.cpp

diff --git a/third_party/grpc/compiler/src/java_plugin/cpp/java_plugin.cpp b/third_party/grpc/compiler/src/java_plugin/cpp/java_plugin.cpp
index 5b4b190..72ead37 100644
--- a/third_party/grpc/compiler/src/java_plugin/cpp/java_plugin.cpp
+++ b/third_party/grpc/compiler/src/java_plugin/cpp/java_plugin.cpp
@@ -9,7 +9,6 @@
 #include <google/protobuf/compiler/code_generator.h>
 #include <google/protobuf/compiler/plugin.h>
 #include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/io/zero_copy_stream.h>
 
 static string JavaPackageToDir(const string& package_name) {
@@ -32,16 +31,20 @@
                         const string& parameter,
                         google::protobuf::compiler::GeneratorContext* context,
                         string* error) const {
-    vector<pair<string, string> > options;
+    std::vector<std::pair<string, string> > options;
     google::protobuf::compiler::ParseGeneratorParameter(parameter, &options);
 
     java_grpc_generator::ProtoFlavor flavor =
         java_grpc_generator::ProtoFlavor::NORMAL;
+
+    bool enable_deprecated = false;
     for (int i = 0; i < options.size(); i++) {
       if (options[i].first == "nano") {
         flavor = java_grpc_generator::ProtoFlavor::NANO;
       } else if (options[i].first == "lite") {
         flavor = java_grpc_generator::ProtoFlavor::LITE;
+      } else if (options[i].first == "enable_deprecated") {
+        enable_deprecated = options[i].second == "true";
       }
     }
 
@@ -54,7 +57,7 @@
           + java_grpc_generator::ServiceClassName(service) + ".java";
       std::unique_ptr<google::protobuf::io::ZeroCopyOutputStream> output(
           context->Open(filename));
-      java_grpc_generator::GenerateService(service, output.get(), flavor);
+      java_grpc_generator::GenerateService(service, output.get(), flavor, enable_deprecated);
     }
     return true;
   }