From 792a0cdb538e60a4bc94196c56d9508d5699838b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Wed, 18 Jul 2018 17:48:28 +0200
Subject: [PATCH] Travis: Update style checks to clang-format 6.0.1

---
 .travis.yml                 | 3 ++-
 misc/travis/clang-format.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 92e8c270975..8f6f0e6b83b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-5.0
+      - llvm-toolchain-trusty-6.0
     packages:
       - build-essential
       - scons
@@ -62,6 +62,7 @@ addons:
 
       # For style checks.
       - clang-format-5.0
+      - libstdc++6 # >= 4.9 needed for clang-format-6.0
 
 before_install:
   - if [ "$STATIC_CHECKS" = "yes" ]; then
diff --git a/misc/travis/clang-format.sh b/misc/travis/clang-format.sh
index d1e37cc10ee..5463998720d 100755
--- a/misc/travis/clang-format.sh
+++ b/misc/travis/clang-format.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CLANG_FORMAT=clang-format-5.0
+CLANG_FORMAT=clang-format-6.0
 
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
     # Check the whole commit range against $TRAVIS_BRANCH, the base merge branch