use -1 rather than ~0 in unsigned integer types

Using ~0 involves a bitwise operation on int, so depends on
the internal representation of signed integers.

1 files changed, 5 insertions, 2 deletions

diff --git a/.travis/cmake-linux b/.travis/cmake-linux
index 9b2a1fae..c0d175f8 100755
--- a/.travis/cmake-linux
+++ b/.travis/cmake-linux
@@ -7,6 +7,7 @@ set -eu
 CACHEDIR="$HOME/cache"
 NPROC=`nproc`
 ASTYLE="$CACHEDIR/astyle/build/gcc/bin/astyle"
+ASTYLE_VERSION=3.1
 
 install_tool() {
   SLUG="$1"
@@ -35,9 +36,10 @@ travis_install() {
   }
 
   # Install astyle (version in ubuntu-precise too old).
-  [ -f "$ASTYLE" ] || {
-    wget -O ../astyle.tar.gz https://deb.debian.org/debian/pool/main/a/astyle/astyle_3.1.orig.tar.gz
+  ([ -f "$ASTYLE" ] && "$ASTYLE" --version | grep "$ASTYLE_VERSION" >/dev/null) || {
+    wget -O ../astyle.tar.gz "https://deb.debian.org/debian/pool/main/a/astyle/astyle_$ASTYLE_VERSION.orig.tar.gz"
     tar -xf ../astyle.tar.gz -C "$CACHEDIR"
+    make -C "$CACHEDIR/astyle/build/gcc" clean
     make -C "$CACHEDIR/astyle/build/gcc" "-j$NPROC"
   }
 
@@ -77,6 +79,7 @@ travis_script() {
   # Coverage flags.
   add_flag -fprofile-arcs -ftest-coverage
 
+  "$ASTYLE" --version
   other/astyle/format-source . "$ASTYLE"
 
   echo "Running TokTok style checker"