diff options
author | Jisi Liu <liujisi@google.com> | 2018-05-15 15:20:51 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-15 15:20:51 -0700 |
commit | 15cde292ce085bec0d089db2e1e2d3403e765d21 (patch) | |
tree | d3b06c5a55b482ee53731b165ddf418bfe21dbe4 /src/google/protobuf/stubs/common.h | |
parent | b61dd9d9a229c5a82788fdeefa344aa65affae09 (diff) | |
parent | 45eb28b588a3b4ef5e54abf92b1f2b7eafb2cbf8 (diff) | |
download | protobuf-15cde292ce085bec0d089db2e1e2d3403e765d21.tar.gz protobuf-15cde292ce085bec0d089db2e1e2d3403e765d21.tar.bz2 protobuf-15cde292ce085bec0d089db2e1e2d3403e765d21.zip |
Merge pull request #4625 from liujisi/3.6.x
Update version number to 3.6.0
Diffstat (limited to 'src/google/protobuf/stubs/common.h')
-rw-r--r-- | src/google/protobuf/stubs/common.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index c336383d..5d320764 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -101,27 +101,27 @@ namespace internal { // The current version, represented as a single integer to make comparison // easier: major * 10^6 + minor * 10^3 + micro -#define GOOGLE_PROTOBUF_VERSION 3005001 +#define GOOGLE_PROTOBUF_VERSION 3006000 // A suffix string for alpha, beta or rc releases. Empty for stable releases. #define GOOGLE_PROTOBUF_VERSION_SUFFIX "" // The minimum library version which works with the current version of the // headers. -#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3005000 +#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3006000 // The minimum header version which works with the current version of // the library. This constant should only be used by protoc's C++ code // generator. -static const int kMinHeaderVersionForLibrary = 3005000; +static const int kMinHeaderVersionForLibrary = 3006000; // The minimum protoc version which works with the current version of the // headers. -#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3005000 +#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3006000 // The minimum header version which works with the current version of // protoc. This constant should only be used in VerifyVersion(). -static const int kMinHeaderVersionForProtoc = 3005000; +static const int kMinHeaderVersionForProtoc = 3006000; // Verifies that the headers and libraries are compatible. Use the macro // below to call this. |