Merge pull request #875 from tkarls/return_correct_bool_type_from_map
Changed return type from int32 to bool in function returning a bool
diff --git a/autogen.sh b/autogen.sh
index 8160313..5b4c29f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,6 +6,18 @@
set -e
+if [ ! -z "$@" ]; then
+ for argument in "$@"; do
+ case $argument in
+ # make curl silent
+ "-s")
+ curlopts="-s"
+ ;;
+ esac
+ done
+fi
+
+
# Check that we're being run from the right directory.
if test ! -f src/google/protobuf/stubs/common.h; then
cat >&2 << __EOF__
@@ -19,7 +31,7 @@
# directory is set up as an SVN external.
if test ! -e gmock; then
echo "Google Mock not present. Fetching gmock-1.7.0 from the web..."
- curl -O https://googlemock.googlecode.com/files/gmock-1.7.0.zip
+ curl $curlopts -O https://googlemock.googlecode.com/files/gmock-1.7.0.zip
unzip -q gmock-1.7.0.zip
rm gmock-1.7.0.zip
mv gmock-1.7.0 gmock
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index e36c7c7..52fba60 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -275,7 +275,7 @@
"MapValueRef::SetInt32Value");
*reinterpret_cast<int32*>(data_) = value;
}
- void SetUInt32Value(uint64 value) {
+ void SetUInt32Value(uint32 value) {
TYPE_CHECK(FieldDescriptor::CPPTYPE_UINT32,
"MapValueRef::SetUInt32Value");
*reinterpret_cast<uint32*>(data_) = value;