diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2016-04-28 14:34:59 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-04-28 14:34:59 -0700 |
| commit | cf14183bcd5485b4a71541599ddce0b35eb71352 (patch) | |
| tree | 12f6e5eb731d7a70cdac4cdafc8b3131629413e2 /src/google/protobuf/compiler/js/js_generator.cc | |
| parent | f00300d7f04f1c38a7d70e271f9232b94dd0e326 (diff) | |
Down integrate from Google internal.
Diffstat (limited to 'src/google/protobuf/compiler/js/js_generator.cc')
| -rwxr-xr-x | src/google/protobuf/compiler/js/js_generator.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/js/js_generator.cc b/src/google/protobuf/compiler/js/js_generator.cc index 534a5b5b..3de61e80 100755 --- a/src/google/protobuf/compiler/js/js_generator.cc +++ b/src/google/protobuf/compiler/js/js_generator.cc @@ -1909,7 +1909,7 @@ void Generator::GenerateClassToObject(const GeneratorOptions& options, printer->Print( " if (includeInstance) {\n" - " obj.$$jspbMessageInstance = msg\n" + " obj.$$jspbMessageInstance = msg;\n" " }\n" " return obj;\n" "};\n" @@ -3032,8 +3032,7 @@ bool Generator::GenerateAll(const vector<const FileDescriptor*>& files, const google::protobuf::FileDescriptor* file = files[i]; string filename = options.output_dir + "/" + GetJSFilename(file->name()); - scoped_ptr<io::ZeroCopyOutputStream> output( - context->Open(filename)); + google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> output(context->Open(filename)); GOOGLE_CHECK(output.get()); io::Printer printer(output.get(), '$'); |