From 922bcd2bf2f2bf7a30981aad3257845cd21a2957 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 30 May 2019 19:55:37 +0700
Subject: [PATCH] restore CI clang 5.0 and 6.0

---
 .travis.yml             | 8 ++++++++
 BUILD_INSTRUCTIONS.md   | 2 +-
 scripts/cloc_all.sh     | 1 +
 scripts/cloc_engine.sh  | 1 +
 scripts/cloc_headers.sh | 1 +
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3049b467..1c5f531e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,14 @@ matrix:
       dist: trusty
       addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-8"] } }
       env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+    - os: linux
+      dist: trusty
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"], packages: ["xorg-dev", "clang-5.0", "g++-7"] } }
+      env: MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
+    - os: linux
+      dist: trusty
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-6.0"], packages: ["xorg-dev", "clang-6.0", "g++-7"] } }
+      env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
     - os: linux
       dist: trusty
       addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-7"], packages: ["xorg-dev", "clang-7", "g++-7"] } }
diff --git a/BUILD_INSTRUCTIONS.md b/BUILD_INSTRUCTIONS.md
index 9eb51929..e23c0a6e 100644
--- a/BUILD_INSTRUCTIONS.md
+++ b/BUILD_INSTRUCTIONS.md
@@ -5,7 +5,7 @@
 - [git](https://git-scm.com/)
 - [git-lfs](https://git-lfs.github.com/)
 - [cmake](https://cmake.org/) **>= 3.11**
-- [gcc](https://www.gnu.org/software/gcc/) **>= 7** or [clang](https://clang.llvm.org/) **>= 7** or [msvc](https://visualstudio.microsoft.com/) **>= 2017**
+- [gcc](https://www.gnu.org/software/gcc/) **>= 7** or [clang](https://clang.llvm.org/) **>= 5.0** or [msvc](https://visualstudio.microsoft.com/) **>= 2017**
 
 ## * Cloning
 
diff --git a/scripts/cloc_all.sh b/scripts/cloc_all.sh
index ab40e99e..300be35a 100755
--- a/scripts/cloc_all.sh
+++ b/scripts/cloc_all.sh
@@ -3,6 +3,7 @@ SCRIPT_DIR=`dirname "$BASH_SOURCE"`
 cloc \
   $SCRIPT_DIR/../headers/enduro2d \
   $SCRIPT_DIR/../headers/3rdparty/ecs.hpp \
+  $SCRIPT_DIR/../headers/3rdparty/flat.hpp \
   $SCRIPT_DIR/../headers/3rdparty/promise.hpp \
   $SCRIPT_DIR/../sources/enduro2d \
   $SCRIPT_DIR/../samples/sources \
diff --git a/scripts/cloc_engine.sh b/scripts/cloc_engine.sh
index 91c18f7b..b2159971 100755
--- a/scripts/cloc_engine.sh
+++ b/scripts/cloc_engine.sh
@@ -3,5 +3,6 @@ SCRIPT_DIR=`dirname "$BASH_SOURCE"`
 cloc \
   $SCRIPT_DIR/../headers/enduro2d \
   $SCRIPT_DIR/../headers/3rdparty/ecs.hpp \
+  $SCRIPT_DIR/../headers/3rdparty/flat.hpp \
   $SCRIPT_DIR/../headers/3rdparty/promise.hpp \
   $SCRIPT_DIR/../sources/enduro2d
diff --git a/scripts/cloc_headers.sh b/scripts/cloc_headers.sh
index a2e9aa29..e9c382a5 100755
--- a/scripts/cloc_headers.sh
+++ b/scripts/cloc_headers.sh
@@ -3,4 +3,5 @@ SCRIPT_DIR=`dirname "$BASH_SOURCE"`
 cloc \
   $SCRIPT_DIR/../headers/enduro2d \
   $SCRIPT_DIR/../headers/3rdparty/ecs.hpp \
+  $SCRIPT_DIR/../headers/3rdparty/flat.hpp \
   $SCRIPT_DIR/../headers/3rdparty/promise.hpp \