generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix warnings from MSVC

Browse Source
This commit is contained in:
Jason Turner 2017-02-22 13:55:02 -07:00
parent f5f6ddf219
commit 40fb8d257e
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/chaiscript/dispatchkit/boxed_number.hpp
View File

@ -588,12 +588,19 @@ namespace chaiscript
template<typename Source, typename Target> template<typename Source, typename Target>
static void check_type() static void check_type()
{ {
#ifdef CHAISCRIPT_MSVC
#pragma warning(push)
#pragma warning(disable : 4127)
#endif
if (sizeof(Source) != sizeof(Target) if (sizeof(Source) != sizeof(Target)
|| std::is_signed<Source>() != std::is_signed<Target>() || std::is_signed<Source>() != std::is_signed<Target>()
|| std::is_floating_point<Source>() != std::is_floating_point<Target>()) || std::is_floating_point<Source>() != std::is_floating_point<Target>())
{ {
throw chaiscript::detail::exception::bad_any_cast(); throw chaiscript::detail::exception::bad_any_cast();
} }
#ifdef CHAISCRIPT_MSVC
#pragma warning(pop)
#endif
} }
template<typename Target> Target get_as_checked() const template<typename Target> Target get_as_checked() const

3
include/chaiscript/language/chaiscript_engine.hpp
View File

@ -145,9 +145,6 @@ namespace chaiscript
}) })
, "call_exists"); , "call_exists");
// m_engine.add(fun<Boxed_Value (const dispatch::Proxy_Function_Base *, const std::vector<Boxed_Value> &)>(std::bind(&chaiscript::dispatch::Proxy_Function_Base::operator(), std::placeholders::_1, std::placeholders::_2, std::ref(m_engine.conversions()))), "call");
//
//
m_engine.add(fun( m_engine.add(fun(
[=](const dispatch::Proxy_Function_Base &t_fun, const std::vector<Boxed_Value> &t_params) -> Boxed_Value { [=](const dispatch::Proxy_Function_Base &t_fun, const std::vector<Boxed_Value> &t_params) -> Boxed_Value {

15
unittests/integer_literal_test.cpp
View File

@ -3,6 +3,12 @@
#include "../static_libs/chaiscript_stdlib.hpp" #include "../static_libs/chaiscript_stdlib.hpp"
#ifdef CHAISCRIPT_MSVC
#pragma warning(push)
#pragma warning(disable : 4146)
#endif
#define TEST_LITERAL(v) test_literal(v, #v) #define TEST_LITERAL(v) test_literal(v, #v)
#define TEST_LITERAL_SIGNED(v) test_literal(v, #v, true) #define TEST_LITERAL_SIGNED(v) test_literal(v, #v, true)
@ -269,8 +275,9 @@ int main()
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} }
#ifdef CHAISCRIPT_MSVC
#pragma warning(pop)
#endif