diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2017-12-01 07:31:37 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-12-01 07:31:37 -0800 |
| commit | a711e3d5b4ee1dd7f9d21197dca8432a5819a64e (patch) | |
| tree | f594ef198ba98a8860b26b3db6cfcc718222ca19 /src/google/protobuf/field_mask.pb.h | |
| parent | 6de51caed52d798815954646b230c5aef3e4d2fc (diff) | |
| parent | a27da093393d3dc7301d27fe328284335cb98528 (diff) | |
Merge pull request #3979 from acozzette/3.5.x-merge
Merge 3.5.x branch into master
Diffstat (limited to 'src/google/protobuf/field_mask.pb.h')
| -rw-r--r-- | src/google/protobuf/field_mask.pb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 3275dc54..9b9032c4 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -8,12 +8,12 @@ #include <google/protobuf/stubs/common.h> -#if GOOGLE_PROTOBUF_VERSION < 3004000 +#if GOOGLE_PROTOBUF_VERSION < 3005000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3004000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 3005000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. |