From 445f1023e1159212c65cb6c27c4f0a3121248a79 Mon Sep 17 00:00:00 2001 From: "kenton@google.com" Date: Thu, 6 Aug 2009 23:01:43 +0000 Subject: Update version number to 2.2.0-pre. --- src/google/protobuf/descriptor.pb.h | 4 ++-- src/google/protobuf/stubs/common.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/google') diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 782a9efb..bc4ec31d 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -7,12 +7,12 @@ #include -#if GOOGLE_PROTOBUF_VERSION < 2001000 +#if GOOGLE_PROTOBUF_VERSION < 2002000 #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 2001001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 2002000 < 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 240c804d..964fb6a6 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 2001001 +#define GOOGLE_PROTOBUF_VERSION 2002000 // The minimum library version which works with the current version of the // headers. -#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2001000 +#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2002000 // 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 = 2001000; +static const int kMinHeaderVersionForLibrary = 2002000; // The minimum protoc version which works with the current version of the // headers. -#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2001000 +#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2002000 // The minimum header version which works with the current version of // protoc. This constant should only be used in VerifyVersion(). -static const int kMinHeaderVersionForProtoc = 2001000; +static const int kMinHeaderVersionForProtoc = 2002000; // Verifies that the headers and libraries are compatible. Use the macro // below to call this. -- cgit v1.2.3