diff options
author | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-12-06 06:20:14 +0000 |
---|---|---|
committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-12-06 06:20:14 +0000 |
commit | 5d8d2b054224bc5fdc73b886f8e765c360f86734 (patch) | |
tree | 650fa406aa2dbacbfb4ff5b640411cb5643d0218 | |
parent | 2726e7a6ebd72eec6f66abe4ced3c88983f20b8e (diff) | |
download | protobuf-5d8d2b054224bc5fdc73b886f8e765c360f86734.tar.gz protobuf-5d8d2b054224bc5fdc73b886f8e765c360f86734.tar.bz2 protobuf-5d8d2b054224bc5fdc73b886f8e765c360f86734.zip |
Fix issues: 200 202 211 215 237 246.
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | java/src/main/java/com/google/protobuf/CodedOutputStream.java | 2 | ||||
-rw-r--r-- | java/src/main/java/com/google/protobuf/GeneratedMessage.java | 1 | ||||
-rw-r--r-- | java/src/main/java/com/google/protobuf/GeneratedMessageLite.java | 1 | ||||
-rw-r--r-- | src/google/protobuf/io/coded_stream.h | 2 | ||||
-rw-r--r-- | src/google/protobuf/repeated_field.h | 8 | ||||
-rw-r--r-- | src/google/protobuf/stubs/common.cc | 12 |
7 files changed, 21 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index d6035ef3..3d8c2112 100644 --- a/configure.ac +++ b/configure.ac @@ -118,7 +118,7 @@ AM_CONDITIONAL([HAVE_ZLIB], [test $HAVE_ZLIB = 1]) AS_IF([test "$with_protoc" != "no"], [ PROTOC=$with_protoc - AS_IF([test "$with_protoc" == "yes"], [ + AS_IF([test "$with_protoc" = "yes"], [ # No argument given. Use system protoc. PROTOC=protoc ]) diff --git a/java/src/main/java/com/google/protobuf/CodedOutputStream.java b/java/src/main/java/com/google/protobuf/CodedOutputStream.java index 51a932a3..f3582e2d 100644 --- a/java/src/main/java/com/google/protobuf/CodedOutputStream.java +++ b/java/src/main/java/com/google/protobuf/CodedOutputStream.java @@ -396,7 +396,7 @@ public final class CodedOutputStream { * for converting the enum value to its numeric value. */ public void writeEnumNoTag(final int value) throws IOException { - writeRawVarint32(value); + writeInt32NoTag(value); } /** Write an {@code sfixed32} field to the stream. */ diff --git a/java/src/main/java/com/google/protobuf/GeneratedMessage.java b/java/src/main/java/com/google/protobuf/GeneratedMessage.java index fc2e5303..2c22fcab 100644 --- a/java/src/main/java/com/google/protobuf/GeneratedMessage.java +++ b/java/src/main/java/com/google/protobuf/GeneratedMessage.java @@ -56,6 +56,7 @@ import java.util.TreeMap; */ public abstract class GeneratedMessage extends AbstractMessage implements Serializable { + private static final long serialVersionUID = 1L; private final UnknownFieldSet unknownFields; diff --git a/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java b/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java index 30a75715..1813e9b3 100644 --- a/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java +++ b/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java @@ -47,6 +47,7 @@ import java.util.Map; */ public abstract class GeneratedMessageLite extends AbstractMessageLite implements Serializable { + private static final long serialVersionUID = 1L; protected GeneratedMessageLite() { } diff --git a/src/google/protobuf/io/coded_stream.h b/src/google/protobuf/io/coded_stream.h index 9a41a644..1b6b4e18 100644 --- a/src/google/protobuf/io/coded_stream.h +++ b/src/google/protobuf/io/coded_stream.h @@ -567,7 +567,7 @@ class LIBPROTOBUF_EXPORT CodedInputStream { // char text[] = "Hello world!"; // // int coded_size = sizeof(magic_number) + -// CodedOutputStream::Varint32Size(strlen(text)) + +// CodedOutputStream::VarintSize32(strlen(text)) + // strlen(text); // // uint8* buffer = diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h index f380e7c0..6080ddcc 100644 --- a/src/google/protobuf/repeated_field.h +++ b/src/google/protobuf/repeated_field.h @@ -616,14 +616,14 @@ inline void RepeatedField<Element>::Truncate(int new_size) { template <typename Element> inline void RepeatedField<Element>::MoveArray( - Element to[], Element from[], int size) { - memcpy(to, from, size * sizeof(Element)); + Element to[], Element from[], int array_size) { + memcpy(to, from, array_size * sizeof(Element)); } template <typename Element> inline void RepeatedField<Element>::CopyArray( - Element to[], const Element from[], int size) { - memcpy(to, from, size * sizeof(Element)); + Element to[], const Element from[], int array_size) { + memcpy(to, from, array_size * sizeof(Element)); } diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc index 1e2d68d2..34a7d139 100644 --- a/src/google/protobuf/stubs/common.cc +++ b/src/google/protobuf/stubs/common.cc @@ -177,6 +177,12 @@ LogMessage::LogMessage(LogLevel level, const char* filename, int line) : level_(level), filename_(filename), line_(line) {} LogMessage::~LogMessage() {} +#if defined(_MSC_VER) && defined(_CPPUNWIND) + #define PROTOBUF_USE_EXCEPTIONS +#elif defined(__EXCEPTIONS) + #define PROTOBUF_USE_EXCEPTIONS +#endif + void LogMessage::Finish() { bool suppress = false; @@ -191,10 +197,16 @@ void LogMessage::Finish() { } if (level_ == LOGLEVEL_FATAL) { +#ifdef PROTOBUF_USE_EXCEPTIONS + throw -1; +#else abort(); +#endif } } +#undef PROTOBUF_USE_EXCEPTIONS + void LogFinisher::operator=(LogMessage& other) { other.Finish(); } |