diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/build/root.build | 6 | ||||
-rw-r--r-- | tests/container/multi-index/driver.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/build/root.build b/tests/build/root.build index 3457f02..9acec0d 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. # diff --git a/tests/container/multi-index/driver.cxx b/tests/container/multi-index/driver.cxx index 7a78e55..9156366 100644 --- a/tests/container/multi-index/driver.cxx +++ b/tests/container/multi-index/driver.cxx @@ -208,7 +208,7 @@ struct person_list_email_set find (const string& email) const { email_map::const_iterator i (email_map_.find (email)); - return i != email_map_.end () ? i->second : end (); + return i != email_map_.end () ? const_iterator (i->second) : end (); } iterator begin () {return person_list_.begin ();} |