diff options
| author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-06 23:01:43 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-06 23:01:43 +0000 |
| commit | 445f1023e1159212c65cb6c27c4f0a3121248a79 (patch) | |
| tree | a43ec2f191dec87c5d8ea90ab2492c45faacafe8 /src | |
| parent | 1a34c92e73b191d990d48f34de0968cc014ab252 (diff) | |
| download | protobuf-445f1023e1159212c65cb6c27c4f0a3121248a79.tar.gz protobuf-445f1023e1159212c65cb6c27c4f0a3121248a79.tar.bz2 protobuf-445f1023e1159212c65cb6c27c4f0a3121248a79.zip | |
Update version number to 2.2.0-pre.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/google/protobuf/descriptor.pb.h | 4 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5755341a..2c73c278 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -73,7 +73,7 @@ nobase_include_HEADERS = \ lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) -libprotobuf_lite_la_LDFLAGS = -version-info 3:0:0 +libprotobuf_lite_la_LDFLAGS = -version-info 4:0:0 libprotobuf_lite_la_SOURCES = \ google/protobuf/stubs/common.cc \ google/protobuf/stubs/once.cc \ @@ -91,7 +91,7 @@ libprotobuf_lite_la_SOURCES = \ google/protobuf/io/zero_copy_stream_impl_lite.cc libprotobuf_la_LIBADD = $(PTHREAD_LIBS) -libprotobuf_la_LDFLAGS = -version-info 3:0:0 +libprotobuf_la_LDFLAGS = -version-info 4:0:0 libprotobuf_la_SOURCES = \ $(libprotobuf_lite_la_SOURCES) \ google/protobuf/stubs/strutil.cc \ @@ -119,7 +119,7 @@ libprotobuf_la_SOURCES = \ google/protobuf/compiler/parser.cc libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la -libprotoc_la_LDFLAGS = -version-info 3:0:0 +libprotoc_la_LDFLAGS = -version-info 4:0:0 libprotoc_la_SOURCES = \ google/protobuf/compiler/code_generator.cc \ google/protobuf/compiler/command_line_interface.cc \ 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 <google/protobuf/stubs/common.h> -#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. |