diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:58 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:58 -0800 |
| commit | ec826c5a592126ddb6b12b47e6e1fb6232ce340d (patch) | |
| tree | d5934719f3eea00b2ea639f2e37d00563a3e5cd5 | |
| parent | 383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a (diff) | |
| parent | 39f577c38ec10b668408d4af3dacaec155a7f0c7 (diff) | |
| download | protobuf-ec826c5a592126ddb6b12b47e6e1fb6232ce340d.tar.gz protobuf-ec826c5a592126ddb6b12b47e6e1fb6232ce340d.tar.bz2 protobuf-ec826c5a592126ddb6b12b47e6e1fb6232ce340d.zip | |
Merge remote-tracking branch 'origin/3.5.x' into master
| -rwxr-xr-x | python/release/wheel/protobuf_optimized_pip.sh | 9 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/io_win32.cc | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/python/release/wheel/protobuf_optimized_pip.sh b/python/release/wheel/protobuf_optimized_pip.sh index 064d1d2a..98306f4c 100755 --- a/python/release/wheel/protobuf_optimized_pip.sh +++ b/python/release/wheel/protobuf_optimized_pip.sh @@ -6,7 +6,7 @@ set -ex # Print usage and fail. function usage() { - echo "Usage: protobuf_optimized_pip.sh PROTOBUF_VERSION PYPI_USERNAME PYPI_PASSWORD" >&2 + echo "Usage: protobuf_optimized_pip.sh PROTOBUF_VERSION" >&2 exit 1 # Causes caller to exit because we use -e. } @@ -25,7 +25,7 @@ if [ $0 != ./protobuf_optimized_pip.sh ]; then exit 1 fi -if [ $# -lt 3 ]; then +if [ $# -lt 1 ]; then usage exit 1 fi @@ -63,7 +63,4 @@ do build_wheel $PYTHON_VERSION done -/opt/python/cp27-cp27mu/bin/twine upload wheelhouse/* <<! -$PYPI_USERNAME -$PYPI_PASSWORD -! +/opt/python/cp27-cp27mu/bin/twine upload wheelhouse/* diff --git a/src/google/protobuf/stubs/io_win32.cc b/src/google/protobuf/stubs/io_win32.cc index eccd0734..5ead98c8 100644 --- a/src/google/protobuf/stubs/io_win32.cc +++ b/src/google/protobuf/stubs/io_win32.cc @@ -91,7 +91,7 @@ struct CharTraits<wchar_t> { template <typename char_type> bool null_or_empty(const char_type* s) { - return s == nullptr || *s == 0; + return s == NULL || *s == 0; } // Returns true if the path starts with a drive letter, e.g. "c:". |