diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-10-08 13:07:05 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-10-08 14:09:31 +0300 |
| commit | f4b5d5064570a9ade5546fdfd81bcdf37def5426 (patch) | |
| tree | 65c3778a1408df07c33cd22db45ccc491babed8e | |
| parent | 38c17cfa45390cb557de75a7ca7852fe023e03ed (diff) | |
Adapt for building with Clang on Windows
| -rw-r--r-- | build/root.build | 6 | ||||
| -rw-r--r-- | odb/pgsql/statement-cache.hxx | 2 | ||||
| -rw-r--r-- | tests/build/root.build | 6 |
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/pgsql/statement-cache.hxx b/odb/pgsql/statement-cache.hxx index 179faa6..c22734b 100644 --- a/odb/pgsql/statement-cache.hxx +++ b/odb/pgsql/statement-cache.hxx @@ -29,7 +29,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_pgsql>::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. # |