From 5c24564811c08772d090305be36fae82d8f12bbe Mon Sep 17 00:00:00 2001 From: "liujisi@google.com" Date: Tue, 3 May 2011 07:06:03 +0000 Subject: Update mainline version to 2.4.2-pre. --- src/google/protobuf/compiler/plugin.pb.h | 2 +- src/google/protobuf/descriptor.pb.h | 2 +- src/google/protobuf/stubs/common.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/google') diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 14216c2a..1cf8a556 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 2004001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 2004002 < 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/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 95febb81..267d0d35 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 2004001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 2004002 < 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 7173a84d..7f5fd4d2 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -108,7 +108,7 @@ 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 2004001 +#define GOOGLE_PROTOBUF_VERSION 2004002 // The minimum library version which works with the current version of the // headers. -- cgit v1.2.3