Merge pull request #65 from offa/ci/clang40

Clang 4.0 and some fixes
mattgodbolt · Mar 15, 2017 · ea485c5 · ea485c5
2 parents 4480081 + 9a28644
commit ea485c5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
-language: cpp
+language: generic
+
 sudo: false
 dist: trusty
 
@@ -22,6 +23,8 @@ matrix:
             - llvm-toolchain-precise-3.8
             - llvm-toolchain-precise-3.7
             - llvm-toolchain-precise-3.6
+            - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main'
+              key_url: 'http://apt.llvm.org/llvm-snapshot.gpg.key'
     - env: CXX=g++-5 CC=gcc-5
       addons:
         apt:
@@ -50,6 +53,14 @@ matrix:
             - g++-4.7
             - valgrind
           sources: *sources
+    - env: CXX=clang++-4.0 CC=clang-4.0
+      addons:
+        apt:
+          packages:
+            - clang-4.0
+            - libc++-dev
+            - valgrind
+          sources: *sources
     - env: CXX=clang++-3.9 CC=clang-3.9
       addons:
         apt:

diff --git a/src/test/c/MockServerImpl.h b/src/test/c/MockServerImpl.h
@@ -53,7 +53,7 @@ class MockServerImpl : public ServerImpl {
     std::string getStatsDocument() const override { return ""; }
     void checkThread() const override { }
     Server &server() override { throw std::runtime_error("not supported"); };
-    size_t clientBufferSize() const { return 512 * 1024; }
+    size_t clientBufferSize() const override { return 512 * 1024; }
 };
 
 }