From ec232823984dc73bb95e19c577f2f7dea1a27364 Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Sun, 13 Sep 2015 23:19:17 +0200
Subject: [PATCH] Now with Linux

---
 .travis.yml        | 3 ++-
 tests/Function.cpp | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8698a498f..102f88dfa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: cpp
 
 os:
+  - linux
   - osx
 
 osx_image: xcode7
@@ -42,7 +43,7 @@ install:
 before_script:
    - mkdir build
    - cd build
-   - if [[ "$CXX" = "g++" && "$CONFIG" = "Debug" ]]; then export CXXFLAGS="--coverage"; fi
+   - if [[ "$CXX" = "g++" && "$CONFIG" = "Debug" && "$TRAVIS_OS_NAME" = "linux" ]]; then export CXXFLAGS="--coverage"; fi
    - cmake .. -DCMAKE_BUILD_TYPE=$CONFIG
 
 script:
diff --git a/tests/Function.cpp b/tests/Function.cpp
index a46b8c627..bd2a47c9a 100644
--- a/tests/Function.cpp
+++ b/tests/Function.cpp
@@ -197,7 +197,7 @@ int Function(int, char**)
     static_assert(not sqlpp::is_numeric_t<TT>::value, "type requirement");
     static_assert(not sqlpp::is_text_t<TT>::value, "type requirement");
 
-    if (nullptr and db(select(exists(select(t.alpha).from(t).where(true)))).front().exists)
+    if (false and db(select(exists(select(t.alpha).from(t).where(true)))).front().exists)
     { /* do something */
     }
   }
@@ -286,7 +286,7 @@ int Function(int, char**)
     static_assert(sqlpp::is_integral_t<TT>::value, "type requirement");
     static_assert(not sqlpp::is_floating_point_t<TT>::value, "type requirement");
 
-    if (nullptr and db(select(count(t.alpha)).from(t).where(true)).front().count)
+    if (false and db(select(count(t.alpha)).from(t).where(true)).front().count)
     { /* do something */
     }
   }