diff options
| -rwxr-xr-x | autogen.sh | 14 | ||||
| -rw-r--r-- | src/google/protobuf/map.h | 2 |
2 files changed, 14 insertions, 2 deletions
@@ -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 @@ fi # 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 e36c7c7a..52fba603 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -275,7 +275,7 @@ class LIBPROTOBUF_EXPORT MapValueRef { "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; |