third_party/protobuf/src/google/protobuf/util/message_differencer.h - Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

Unified Diff: third_party/protobuf/src/google/protobuf/util/message_differencer.h

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)

Patch Set: Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/protobuf/src/google/protobuf/util/json_util_test.cc ('k') | third_party/protobuf/src/google/protobuf/util/message_differencer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/util/message_differencer.h

diff --git a/third_party/protobuf/src/google/protobuf/util/message_differencer.h b/third_party/protobuf/src/google/protobuf/util/message_differencer.h

index d99223cbd86a178b3b4869cd9af2857a7de92376..3ea74e673dd70d031160975dafe5202d1e64ad00 100644

--- a/third_party/protobuf/src/google/protobuf/util/message_differencer.h

+++ b/third_party/protobuf/src/google/protobuf/util/message_differencer.h

@@ -221,19 +221,19 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {

// Reports that a field has been added into Message2.

virtual void ReportAdded(

const Message& message1, const Message& message2,

- const std::vector<SpecificField>& field_path) = 0;

+ const vector<SpecificField>& field_path) = 0;

// Reports that a field has been deleted from Message1.

virtual void ReportDeleted(

const Message& message1,

const Message& message2,

- const std::vector<SpecificField>& field_path) = 0;

+ const vector<SpecificField>& field_path) = 0;

// Reports that the value of a field has been modified.

virtual void ReportModified(

const Message& message1,

const Message& message2,

- const std::vector<SpecificField>& field_path) = 0;

+ const vector<SpecificField>& field_path) = 0;

// Reports that a repeated field has been moved to another location. This

// only applies when using TreatAsSet or TreatAsMap() -- see below. Also

@@ -243,7 +243,7 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {

virtual void ReportMoved(

const Message& message1,

const Message& message2,

- const std::vector<SpecificField>& field_path) { }

+ const vector<SpecificField>& field_path) { }

// Reports that two fields match. Useful for doing side-by-side diffs.

// This function is mutually exclusive with ReportModified and ReportMoved.

@@ -252,7 +252,7 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {

virtual void ReportMatched(

const Message& message1,

const Message& message2,

- const std::vector<SpecificField>& field_path) { }

+ const vector<SpecificField>& field_path) { }

// Reports that two fields would have been compared, but the

// comparison has been skipped because the field was marked as

@@ -276,14 +276,14 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {

virtual void ReportIgnored(

const Message& message1,

const Message& message2,

- const std::vector<SpecificField>& field_path) { }

+ const vector<SpecificField>& field_path) { }

- // Report that an unknown field is ignored. (see comment above).

+ // Report that an unkown field is ignored. (see comment above).

// Note this is a different function since the last SpecificField in field

// path has a null field. This could break existing Reporter.

virtual void ReportUnknownFieldIgnored(

const Message& message1, const Message& message2,

- const std::vector<SpecificField>& field_path) {}

+ const vector<SpecificField>& field_path) {}

private:

GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Reporter);

@@ -296,10 +296,9 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {

MapKeyComparator();

virtual ~MapKeyComparator();

- virtual bool IsMatch(

- const Message& message1,

- const Message& message2,

- const std::vector<SpecificField>& parent_fields) const {

+ virtual bool IsMatch(const Message& message1,

+ const Message& message2,

+ const vector<SpecificField>& parent_fields) const {

GOOGLE_CHECK(false) << "IsMatch() is not implemented.";

return false;

}

@@ -324,7 +323,7 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {

const Message& message1,

const Message& message2,

const FieldDescriptor* field,

- const std::vector<SpecificField>& parent_fields) = 0;

+ const vector<SpecificField>& parent_fields) = 0;

// Returns true if the unknown field should be ignored.

// Note: This will be called for unknown fields as well in which case

@@ -332,7 +331,7 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {

virtual bool IsUnknownFieldIgnored(

const Message& message1, const Message& message2,

const SpecificField& field,

- const std::vector<SpecificField>& parent_fields) {

+ const vector<SpecificField>& parent_fields) {

return false;

}

};

@@ -441,7 +440,7 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {

// size of each element.

void TreatAsMapWithMultipleFieldsAsKey(

const FieldDescriptor* field,

- const std::vector<const FieldDescriptor*>& key_fields);

+ const vector<const FieldDescriptor*>& key_fields);

// Same as TreatAsMapWithMultipleFieldsAsKey, except that each of the field

// do not necessarily need to be a direct subfield. Each element in

// key_field_paths indicate a path from the message being compared, listing

@@ -457,7 +456,7 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {

// !key_field_path[i]->is_repeated()

void TreatAsMapWithMultipleFieldPathsAsKey(

const FieldDescriptor* field,

- const std::vector<std::vector<const FieldDescriptor*> >& key_field_paths);

+ const vector<vector<const FieldDescriptor*> >& key_field_paths);

// Uses a custom MapKeyComparator to determine if two elements have the same

// key when comparing a repeated field as a map.

@@ -550,10 +549,9 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {

// Same as above, except comparing only the list of fields specified by the

// two vectors of FieldDescriptors.

- bool CompareWithFields(

- const Message& message1, const Message& message2,

- const std::vector<const FieldDescriptor*>& message1_fields,

- const std::vector<const FieldDescriptor*>& message2_fields);

+ bool CompareWithFields(const Message& message1, const Message& message2,

+ const vector<const FieldDescriptor*>& message1_fields,

+ const vector<const FieldDescriptor*>& message2_fields);

// Automatically creates a reporter that will output the differences

// found (if any) to the specified output string pointer. Note that this

@@ -572,12 +570,6 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {

// any differences found in human-readable form to the supplied

// ZeroCopyOutputStream or Printer. If a printer is used, the delimiter

// *must* be '$'.

- //

- // WARNING: this reporter does not necessarily flush its output until it is

- // destroyed. As a result, it is not safe to assume the output is valid or

- // complete until after you destroy the reporter. For example, if you use a

- // StreamReporter to write to a StringOutputStream, the target string may

- // contain uninitialized data until the reporter is destroyed.

class LIBPROTOBUF_EXPORT StreamReporter : public Reporter {

public:

explicit StreamReporter(io::ZeroCopyOutputStream* output);

@@ -593,35 +585,35 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {

// The following are implementations of the methods described above.

virtual void ReportAdded(const Message& message1, const Message& message2,

- const std::vector<SpecificField>& field_path);