diff options
author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-05-13 23:20:03 +0000 |
---|---|---|
committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-05-13 23:20:03 +0000 |
commit | 1fb3d394e5bb4ded7a76dc8d44a701733aad3553 (patch) | |
tree | c60aca1185c2c9ff68f5a505fef3994d44c3a473 /src | |
parent | 1d4df6caa4cbf39fec64e3d8f8acb8d2946e0813 (diff) | |
download | protobuf-1fb3d394e5bb4ded7a76dc8d44a701733aad3553.tar.gz protobuf-1fb3d394e5bb4ded7a76dc8d44a701733aad3553.tar.bz2 protobuf-1fb3d394e5bb4ded7a76dc8d44a701733aad3553.zip |
Update version number in trunk.
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/descriptor.pb.h | 4 | ||||
-rw-r--r-- | src/google/protobuf/stubs/common.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 7247bfd6..6be84719 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -7,12 +7,12 @@ #include <google/protobuf/stubs/common.h> -#if GOOGLE_PROTOBUF_VERSION < 2000003 +#if GOOGLE_PROTOBUF_VERSION < 2001000 #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 2000004 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 2001001 < 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. diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 96be91b7..ace1077d 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -83,24 +83,24 @@ 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 2000004 +#define GOOGLE_PROTOBUF_VERSION 2001001 // The minimum library version which works with the current version of the // headers. -#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2000003 +#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2001000 // 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 = 2000003; +static const int kMinHeaderVersionForLibrary = 2001000; // The minimum protoc version which works with the current version of the // headers. -#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2000003 +#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2001000 // The minimum header version which works with the current version of // protoc. This constant should only be used in VerifyVersion(). -static const int kMinHeaderVersionForProtoc = 2000003; +static const int kMinHeaderVersionForProtoc = 2001000; // Verifies that the headers and libraries are compatible. Use the macro // below to call this. |