* Update version compatibility stuff -- 2.0.3 is in no way compatible with
2.0.2.
* Minor Tru64 fix.
diff --git a/configure.ac b/configure.ac
index d56144c..e73ea10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@
# * java/pom.xml
# * python/setup.py
# * src/google/protobuf/stubs/common.h
+# * src/Makefile.am (Update -version-info for LDFLAGS if needed)
AC_INIT([protobuf],[2.0.3-SNAPSHOT],[protobuf@googlegroups.com])
AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)
diff --git a/src/Makefile.am b/src/Makefile.am
index 9e97e62..c13a723 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,7 +55,7 @@
lib_LTLIBRARIES = libprotobuf.la libprotoc.la
libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
-libprotobuf_la_LDFLAGS = -version-info 2:0:0
+libprotobuf_la_LDFLAGS = -version-info 3:0:0
libprotobuf_la_SOURCES = \
google/protobuf/stubs/common.cc \
google/protobuf/stubs/hash.cc \
@@ -91,7 +91,7 @@
google/protobuf/compiler/parser.cc
libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la
-libprotoc_la_LDFLAGS = -version-info 0:0:0
+libprotoc_la_LDFLAGS = -version-info 3: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 693f0f9..8fa51dd 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -7,7 +7,7 @@
#include <google/protobuf/stubs/common.h>
-#if GOOGLE_PROTOBUF_VERSION < 2000002
+#if GOOGLE_PROTOBUF_VERSION < 2000003
#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.
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
index fbd2231..b62d0e3 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -87,20 +87,20 @@
// The minimum library version which works with the current version of the
// headers.
-#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2000002
+#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2000003
// 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 = 2000002;
+static const int kMinHeaderVersionForLibrary = 2000003;
// The minimum protoc version which works with the current version of the
// headers.
-#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2000002
+#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2000003
// The minimum header version which works with the current version of
// protoc. This constant should only be used in VerifyVersion().
-static const int kMinHeaderVersionForProtoc = 2000002;
+static const int kMinHeaderVersionForProtoc = 2000003;
// Verifies that the headers and libraries are compatible. Use the macro
// below to call this.
diff --git a/src/gtest/internal/gtest-port.h b/src/gtest/internal/gtest-port.h
index 9d65ec8..791dcd2 100644
--- a/src/gtest/internal/gtest-port.h
+++ b/src/gtest/internal/gtest-port.h
@@ -438,11 +438,11 @@
// Defines tr1::is_pointer (only needed for Symbian).
-#ifdef __SYMBIAN32__
+#if defined(__SYMBIAN32__) || (defined (__DECCXX) && defined(__osf__))
-// Symbian does not have tr1::type_traits, so we define our own is_pointer
-// These are needed as the Nokia Symbian Compiler cannot decide between
-// const T& and const T* in a function template.
+// Symbian and HP C++ on Tru64 do not have tr1::type_traits, so we define
+// our own is_pointer. These are needed as these compilers cannot decide
+// between const T& and const T* in a function template.
template <bool bool_value>
struct bool_constant {
