aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisi Liu <liujisi@google.com>2014-09-03 22:30:50 -0700
committerJisi Liu <liujisi@google.com>2014-09-03 22:30:50 -0700
commit9faecf7e93e30932759a28bfd9b639b0c39fb974 (patch)
treed3a0920ad51f9ce6b5f0980de9a1895609db72ed
parent1392f42d1b8113fbc13fa396dd526e2ddb45baa9 (diff)
parentc871fb9384fef312ac76334ff97a83b980b57eba (diff)
downloadprotobuf-9faecf7e93e30932759a28bfd9b639b0c39fb974.tar.gz
protobuf-9faecf7e93e30932759a28bfd9b639b0c39fb974.tar.bz2
protobuf-9faecf7e93e30932759a28bfd9b639b0c39fb974.zip
Merge pull request #12 from huahang/patch-2
remove a const qualifier in a method's return type
-rw-r--r--src/google/protobuf/generated_message_reflection.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc
index 853aadbf..7cfaa98c 100644
--- a/src/google/protobuf/generated_message_reflection.cc
+++ b/src/google/protobuf/generated_message_reflection.cc
@@ -1496,7 +1496,7 @@ inline uint32* GeneratedMessageReflection::MutableHasBits(
return reinterpret_cast<uint32*>(ptr);
}
-inline const uint32 GeneratedMessageReflection::GetOneofCase(
+inline uint32 GeneratedMessageReflection::GetOneofCase(
const Message& message,
const OneofDescriptor* oneof_descriptor) const {
const void* ptr = reinterpret_cast<const uint8*>(&message)