From 820195b30365d1151759c9f72f8ee8b7c6cf364e Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Mon, 28 Dec 2015 10:39:53 +0100
Subject: [PATCH] Turned off is_regular for msvc

---
 include/sqlpp11/where.h | 1 +
 tests/is_regular.h      | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/sqlpp11/where.h b/include/sqlpp11/where.h
index c0c4a2c5..5a0880da 100644
--- a/include/sqlpp11/where.h
+++ b/include/sqlpp11/where.h
@@ -339,6 +339,7 @@ namespace sqlpp
         return _where_impl<_database_t>(Check{});
       }
 
+      // MSVC does not comprehend this, and must therefore have a separate function with no arguments.
       template <typename... Expressions>
       auto dynamic_where(Expressions... expressions) const
           -> _new_statement_t<check_where_dynamic_t<_database_t, Expressions...>, where_t<_database_t, Expressions...>>
diff --git a/tests/is_regular.h b/tests/is_regular.h
index 7af79630..6c4fdf7e 100644
--- a/tests/is_regular.h
+++ b/tests/is_regular.h
@@ -45,14 +45,16 @@ namespace sqlpp
 
     static constexpr bool value =
         true
+#if !defined _MSC_VER
 #if defined SQLPP_TEST_NO_THROW_MOVE_CONSTRUCTIBLE
         and std::is_nothrow_move_constructible<T>::value
 #endif
         and std::is_move_assignable<T>::value  // containers and strings are not noexcept_assignable
         and std::is_copy_constructible<T>::value and std::is_copy_assignable<T>::value
-        // default constructor makes no sense
-        // (not) equals would be possible
-        // not sure about less
+// default constructor makes no sense
+// (not) equals would be possible
+// not sure about less
+#endif
         ;
   };
 }