From 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Mon, 10 Nov 2014 17:34:54 -0800
Subject: Down-integrate from internal code base.

---
 src/google/protobuf/compiler/java/java_generator.cc | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/google/protobuf/compiler/java/java_generator.cc')

diff --git a/src/google/protobuf/compiler/java/java_generator.cc b/src/google/protobuf/compiler/java/java_generator.cc
index c3a47e3e..a743ce22 100644
--- a/src/google/protobuf/compiler/java/java_generator.cc
+++ b/src/google/protobuf/compiler/java/java_generator.cc
@@ -35,6 +35,9 @@
 #include <google/protobuf/compiler/java/java_generator.h>
 
 #include <memory>
+#ifndef _SHARED_PTR_H
+#include <google/protobuf/stubs/shared_ptr.h>
+#endif
 
 #include <google/protobuf/compiler/java/java_file.h>
 #include <google/protobuf/compiler/java/java_generator_factory.h>
@@ -99,10 +102,14 @@ bool JavaGenerator::Generate(const FileDescriptor* file,
 
   vector<string> all_files;
 
+
   vector<FileGenerator*> file_generators;
   if (generate_immutable_code) {
     file_generators.push_back(new FileGenerator(file, /* immutable = */ true));
   }
+  if (generate_mutable_code) {
+    file_generators.push_back(new FileGenerator(file, /* mutable = */ false));
+  }
   for (int i = 0; i < file_generators.size(); ++i) {
     if (!file_generators[i]->Validate(error)) {
       for (int j = 0; j < file_generators.size(); ++j) {
-- 
cgit v1.2.3