diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-07 20:14:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-07 20:14:59 +0200 |
commit | 08fa3d511f2b96613bbbe76e517f2c9288e5bf56 (patch) | |
tree | 0210f08935553ea30dd17d4f19086de4b5fa880c /vendor/github.com/gogo/protobuf/proto/lib.go | |
parent | 9d0d9df6a1973ce9982071601fbdca68c93c6d07 (diff) | |
parent | 42fcdbf1a85c8e23ccc25a0e7e66b3a51b8f11dd (diff) | |
download | podman-08fa3d511f2b96613bbbe76e517f2c9288e5bf56.tar.gz podman-08fa3d511f2b96613bbbe76e517f2c9288e5bf56.tar.bz2 podman-08fa3d511f2b96613bbbe76e517f2c9288e5bf56.zip |
Merge pull request #5744 from vrothberg/update-image
vendor c/image v5.4.2
Diffstat (limited to 'vendor/github.com/gogo/protobuf/proto/lib.go')
-rw-r--r-- | vendor/github.com/gogo/protobuf/proto/lib.go | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/vendor/github.com/gogo/protobuf/proto/lib.go b/vendor/github.com/gogo/protobuf/proto/lib.go index d17f80209..80db1c155 100644 --- a/vendor/github.com/gogo/protobuf/proto/lib.go +++ b/vendor/github.com/gogo/protobuf/proto/lib.go @@ -948,13 +948,19 @@ func isProto3Zero(v reflect.Value) bool { return false } -// ProtoPackageIsVersion2 is referenced from generated protocol buffer files -// to assert that that code is compatible with this version of the proto package. -const GoGoProtoPackageIsVersion2 = true - -// ProtoPackageIsVersion1 is referenced from generated protocol buffer files -// to assert that that code is compatible with this version of the proto package. -const GoGoProtoPackageIsVersion1 = true +const ( + // ProtoPackageIsVersion3 is referenced from generated protocol buffer files + // to assert that that code is compatible with this version of the proto package. + GoGoProtoPackageIsVersion3 = true + + // ProtoPackageIsVersion2 is referenced from generated protocol buffer files + // to assert that that code is compatible with this version of the proto package. + GoGoProtoPackageIsVersion2 = true + + // ProtoPackageIsVersion1 is referenced from generated protocol buffer files + // to assert that that code is compatible with this version of the proto package. + GoGoProtoPackageIsVersion1 = true +) // InternalMessageInfo is a type used internally by generated .pb.go files. // This type is not intended to be used by non-generated code. |