diff options
author | Bo Yang <teboring@google.com> | 2015-09-15 18:25:02 -0700 |
---|---|---|
committer | Bo Yang <teboring@google.com> | 2015-10-04 13:22:54 -0700 |
commit | 7c14dc837b2fcd61ed244ced90debeb4b42d1119 (patch) | |
tree | ebaea9d0a20b315f4f372136200494d4aff3936c /src/google/protobuf/util/internal/protostream_objectwriter.cc | |
parent | fbabf987e671aa37d11e1163e0175f99b32df5fe (diff) |
Down-integrate internal bug fixing changes.
Diffstat (limited to 'src/google/protobuf/util/internal/protostream_objectwriter.cc')
-rw-r--r-- | src/google/protobuf/util/internal/protostream_objectwriter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/util/internal/protostream_objectwriter.cc b/src/google/protobuf/util/internal/protostream_objectwriter.cc index a935ac39..cb0c193b 100644 --- a/src/google/protobuf/util/internal/protostream_objectwriter.cc +++ b/src/google/protobuf/util/internal/protostream_objectwriter.cc @@ -1113,7 +1113,7 @@ Status ProtoStreamObjectWriter::RenderFieldMask(ProtoStreamObjectWriter* ow, // conversions as much as possible. Because ToSnakeCase sometimes returns the // wrong value. google::protobuf::scoped_ptr<ResultCallback1<util::Status, StringPiece> > callback( - NewPermanentCallback(&RenderOneFieldPath, ow)); + google::protobuf::internal::NewPermanentCallback(&RenderOneFieldPath, ow)); return DecodeCompactFieldMaskPaths(data.str(), callback.get()); } |