From e6c81600acd2d32a50cacc73375df692b3672f62 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <michael.tautschnig@qmul.ac.uk>
Date: Sun, 18 Dec 2016 17:44:24 +0000
Subject: [PATCH 1/2] Travis config for GCC 5 and Clang 3.7

The build matrix is constructed from os and compiler. OSX and Linux are
picked as operating systems for compilation, and linting is run as a
parallel task. Linux uses GCC/g++ 5 and Clang 3.7.
---
 .travis.yml | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 51999590a93..64ef93f5278 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,44 +5,39 @@ sudo: required
 matrix:
   include:
     - os: linux
-      dist: trusty
-      compiler: clang
+      compiler: gcc
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            # newer g++ version (also pulls libstdc++)
-            - g++-4.9
             - libwww-perl
+            - g++-5
+      before_install:
+        - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 90
+      env: COMPILER=g++-5
     - os: linux
-      dist: trusty
-      compiler: gcc
+      compiler: clang
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.7
           packages:
-            # newer g++ version (also pulls libstdc++)
-            - g++-4.9
             - libwww-perl
+            - clang-3.7
       before_install:
-        - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 90
-    - os: osx
-      compiler: clang
+        - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/clang-3.7 90
+      env: COMPILER=clang++-3.7
     - os: osx
       compiler: gcc
-
-addons:
-  apt:
-    packages:
-      - libwww-perl
+      env: COMPILER=g++
+    - os: osx
+      compiler: clang
+      env: COMPILER=clang++
+    - env: NAME="CPP-LINT"
+      script: DIFF=`git diff --name-only master HEAD` && if [ "$DIFF" != "" ]; then python scripts/cpplint.py $DIFF; fi
 
 script:
   - make -C src minisat2-download
-  - make -C src CXXFLAGS="-Wall -O2 -g -Werror -Wno-deprecated-register -pedantic -Wno-sign-compare" -j2 && make -C regression test
-
-matrix:
-  include:
-    - env: NAME="CPP-LINT"
-      script: DIFF=`git diff --name-only master HEAD` && if [ "$DIFF" != "" ]; then python scripts/cpplint.py $DIFF; fi
+  - make -C src CXX=$COMPILER CXXFLAGS="-Wall -O2 -g -Werror -Wno-deprecated-register -pedantic -Wno-sign-compare" -j2 && make -C regression test

From 0cf097290f71c10d2cd43c8393a9454cf4355c8c Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Wed, 21 Dec 2016 23:06:32 +0100
Subject: [PATCH 2/2] Ensure intended operator precedence
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

G++-5 warned: "suggest parentheses around operand of ‘!’ or change ‘&’
to ‘&&’ or ‘!’ to ‘~’"
---
 src/solvers/miniBDD/miniBDD.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/solvers/miniBDD/miniBDD.cpp b/src/solvers/miniBDD/miniBDD.cpp
index 449cc31b7d0..345a84b9b97 100644
--- a/src/solvers/miniBDD/miniBDD.cpp
+++ b/src/solvers/miniBDD/miniBDD.cpp
@@ -408,7 +408,7 @@ BDD substitute(const BDD &t, unsigned var, const BDD &tp)
   //  (!tp & t[var/0])
 
   return ( tp & restrict(t, var, true)) |
-         (!tp & restrict(t, var, false));
+         ((!tp) & restrict(t, var, false));
 }
 
 void cubes(const BDD &u, const std::string &path, std::string &result)