diff options
author | Srivats P <pstavirs@users.noreply.github.com> | 2016-08-29 22:57:46 +0530 |
---|---|---|
committer | Srivats P <pstavirs@users.noreply.github.com> | 2016-08-29 22:57:46 +0530 |
commit | eedc7be6803924e158e6a08471bbdf1908c7a93e (patch) | |
tree | 1bf4550c5d5d585bda78ad09f8b2c6f7a87b5211 /src/google/protobuf/util | |
parent | 3d9d1a1255583bac550f7bf94f3016e8c238fa5e (diff) |
Restore New*Callback into google::protobuf namespace since these are used by the service stubs code
Fixes #1966
Diffstat (limited to 'src/google/protobuf/util')
-rw-r--r-- | src/google/protobuf/util/internal/protostream_objectwriter.cc | 2 | ||||
-rw-r--r-- | src/google/protobuf/util/message_differencer.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/google/protobuf/util/internal/protostream_objectwriter.cc b/src/google/protobuf/util/internal/protostream_objectwriter.cc index 1825f556..73e05cfe 100644 --- a/src/google/protobuf/util/internal/protostream_objectwriter.cc +++ b/src/google/protobuf/util/internal/protostream_objectwriter.cc @@ -907,7 +907,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( - ::google::protobuf::internal::NewPermanentCallback(&RenderOneFieldPath, ow)); + NewPermanentCallback(&RenderOneFieldPath, ow)); return DecodeCompactFieldMaskPaths(data.str(), callback.get()); } diff --git a/src/google/protobuf/util/message_differencer.cc b/src/google/protobuf/util/message_differencer.cc index a6d0cb07..03a334b6 100644 --- a/src/google/protobuf/util/message_differencer.cc +++ b/src/google/protobuf/util/message_differencer.cc @@ -1389,8 +1389,7 @@ bool MessageDifferencer::MatchRepeatedFieldIndices( // doesn't necessarily imply Compare(b, c). Therefore a naive greedy // algorithm will fail to find a maximum matching. // Here we use the argumenting path algorithm. - MaximumMatcher::NodeMatchCallback* callback = - ::google::protobuf::internal::NewPermanentCallback( + MaximumMatcher::NodeMatchCallback* callback = NewPermanentCallback( this, &MessageDifferencer::IsMatch, repeated_field, key_comparator, &message1, &message2, parent_fields); |