aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-10-08 14:50:24 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-10-08 15:31:08 +0300
commit9111fbfe4a0557b53f59b7bf98aad418b0def867 (patch)
tree33b694c642bc4956445c84ce65acf20b4dd21bbe
parent5529924aaf19a0de7c4e5a3bd101288b5053fb56 (diff)
Adapt for building with Clang on Windows
-rw-r--r--build/root.build6
-rw-r--r--odb/mysql/statement-cache.hxx2
-rw-r--r--tests/build/root.build6
3 files changed, 7 insertions, 7 deletions
diff --git a/build/root.build b/build/root.build
index cdbd7ef..ece30fb 100644
--- a/build/root.build
+++ b/build/root.build
@@ -11,11 +11,11 @@ ixx{*}: extension = ixx
txx{*}: extension = txx
cxx{*}: extension = cxx
-if ($cxx.class == 'msvc')
-{
+if ($cxx.target.system == 'win32-msvc')
cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+
+if ($cxx.class == 'msvc')
cxx.coptions += /wd4251 /wd4275 /wd4800
-}
# Load the cli module but only if it's available. This way a distribution
# that includes pre-generated files can be built without installing cli.
diff --git a/odb/mysql/statement-cache.hxx b/odb/mysql/statement-cache.hxx
index 6ac3e02..7ce56a9 100644
--- a/odb/mysql/statement-cache.hxx
+++ b/odb/mysql/statement-cache.hxx
@@ -31,7 +31,7 @@ namespace odb
public:
statement_cache (connection& conn)
: conn_ (conn),
- version_seq_ (conn.database ().schema_version_sequence ()) {}
+ version_seq_ (conn_.database ().schema_version_sequence ()) {}
template <typename T>
typename object_traits_impl<T, id_mysql>::statements_type&
diff --git a/tests/build/root.build b/tests/build/root.build
index 216fa84..da6ff40 100644
--- a/tests/build/root.build
+++ b/tests/build/root.build
@@ -9,11 +9,11 @@ using cxx
hxx{*}: extension = hxx
cxx{*}: extension = cxx
-if ($cxx.class == 'msvc')
-{
+if ($cxx.target.system == 'win32-msvc')
cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+
+if ($cxx.class == 'msvc')
cxx.coptions += /wd4251 /wd4275 /wd4800
-}
# Every exe{} in this subproject is by default a test.
#