diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-10-21 16:47:33 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-10-21 16:47:33 -0700 |
| commit | df5481c6b38b147e7eeb657d2bd1afdff77ec3ee (patch) | |
| tree | 326ec5bb9c3ad1ebd1ddba1261bdace57a3ccef3 /src | |
| parent | f9e623b1671c8333247f251c5c4a2ef2ad7bcb2d (diff) | |
Update version number to 2.6.2-pre.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/plugin.pb.h | 2 | ||||
| -rw-r--r-- | src/google/protobuf/descriptor.pb.h | 2 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 45ba4d3b..967b8c7d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -95,7 +95,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 9:1:0 -export-dynamic -no-undefined +libprotobuf_lite_la_LDFLAGS = -version-info 9:2:0 -export-dynamic -no-undefined libprotobuf_lite_la_SOURCES = \ google/protobuf/stubs/atomicops_internals_x86_gcc.cc \ google/protobuf/stubs/atomicops_internals_x86_msvc.cc \ @@ -117,7 +117,7 @@ libprotobuf_lite_la_SOURCES = \ google/protobuf/io/zero_copy_stream_impl_lite.cc libprotobuf_la_LIBADD = $(PTHREAD_LIBS) -libprotobuf_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined +libprotobuf_la_LDFLAGS = -version-info 9:2:0 -export-dynamic -no-undefined libprotobuf_la_SOURCES = \ $(libprotobuf_lite_la_SOURCES) \ google/protobuf/stubs/strutil.cc \ @@ -146,7 +146,7 @@ libprotobuf_la_SOURCES = \ google/protobuf/compiler/parser.cc libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la -libprotoc_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined +libprotoc_la_LDFLAGS = -version-info 9:2:0 -export-dynamic -no-undefined libprotoc_la_SOURCES = \ google/protobuf/compiler/code_generator.cc \ google/protobuf/compiler/command_line_interface.cc \ diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 65634da4..567b30ef 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 2006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 2006002 < 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 45521812..dd721be9 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 2006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 2006002 < 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 f096fa99..dde48f47 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -113,7 +113,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 2006001 +#define GOOGLE_PROTOBUF_VERSION 2006002 // The minimum library version which works with the current version of the // headers. |