Eliminate unnecessary warnings on MSVC (catch)
Mostly caused by catch
This commit is contained in:
parent
0e41e373c6
commit
ddc6ac8e00
@ -811,6 +811,12 @@ namespace chaiscript
|
||||
return false;
|
||||
}
|
||||
|
||||
#ifdef CHAISCRIPT_MSVC
|
||||
// MSVC is unable to recognize that "rethrow_exception" causes the function to return
|
||||
// so we must disable it here.
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4715)
|
||||
#endif
|
||||
Boxed_Value call_member(const std::string &t_name, const std::vector<Boxed_Value> ¶ms, bool t_has_params) const
|
||||
{
|
||||
const auto funs = get_function(t_name);
|
||||
@ -887,6 +893,11 @@ namespace chaiscript
|
||||
}
|
||||
}
|
||||
}
|
||||
#ifdef CHAISCRIPT_MSVC
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
Boxed_Value call_function(const std::string &t_name, const std::vector<Boxed_Value> ¶ms) const
|
||||
{
|
||||
|
@ -1,9 +1,11 @@
|
||||
// All of these are necessary because of catch.hpp. It's OK, they'll be
|
||||
// caught in other cpp files if chaiscript causes them
|
||||
|
||||
#include <chaiscript/utility/utility.hpp>
|
||||
|
||||
#ifdef CHAISCRIPT_MSVC
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4190 4640)
|
||||
#pragma warning(disable : 4190 4640 28251)
|
||||
#endif
|
||||
|
||||
#ifdef __GNUC__
|
||||
@ -24,7 +26,6 @@
|
||||
|
||||
#define CATCH_CONFIG_MAIN
|
||||
|
||||
#include <chaiscript/utility/utility.hpp>
|
||||
#include "catch.hpp"
|
||||
|
||||
// lambda_tests
|
||||
|
Loading…
x
Reference in New Issue
Block a user