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

Various warning cleanups

Browse Source
This commit is contained in:
Jason Turner 2015-03-25 17:30:19 -06:00
parent c32a944b9d
commit 95ead0dbfb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/chaiscript/dispatchkit/register_function.hpp
View File

@ -40,7 +40,7 @@ namespace chaiscript
template<typename Ret, typename Class, typename ... Args> template<typename Ret, typename Class, typename ... Args>
std::function<Ret (Class &, Args...) > to_function(Ret (Class::*func)(Args...)) std::function<Ret (Class &, Args...) > to_function(Ret (Class::*func)(Args...))
{ {
#ifdef CHAISCRIPT_MSVC_12 #ifdef CHAISCRIPT_MSVC
/// \todo this std::mem_fn wrap shouldn't be necessary but type conversions for /// \todo this std::mem_fn wrap shouldn't be necessary but type conversions for
/// std::function for member function pointers seems to be broken in MSVC /// std::function for member function pointers seems to be broken in MSVC
return std::function<Ret(Class &, Args...)>(std::mem_fn(func)); return std::function<Ret(Class &, Args...)>(std::mem_fn(func));
@ -52,7 +52,7 @@ namespace chaiscript
template<typename Ret, typename Class, typename ... Args> template<typename Ret, typename Class, typename ... Args>
std::function<Ret (const Class &, Args...) > to_function(Ret (Class::*func)(Args...) const) std::function<Ret (const Class &, Args...) > to_function(Ret (Class::*func)(Args...) const)
{ {
#ifdef CHAISCRIPT_MSVC_12 #ifdef CHAISCRIPT_MSVC
/// \todo this std::mem_fn wrap shouldn't be necessary but type conversions for /// \todo this std::mem_fn wrap shouldn't be necessary but type conversions for
/// std::function for member function pointers seems to be broken in MSVC /// std::function for member function pointers seems to be broken in MSVC
return std::function<Ret(const Class &, Args...)>(std::mem_fn(func)); return std::function<Ret(const Class &, Args...)>(std::mem_fn(func));

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

@ -540,7 +540,8 @@ namespace chaiscript
struct Equation_AST_Node : public AST_Node { struct Equation_AST_Node : public AST_Node {
public: public:
Equation_AST_Node(std::string t_ast_node_text = "", const std::shared_ptr<std::string> &t_fname=std::shared_ptr<std::string>(), int t_start_line = 0, int t_start_col = 0, int t_end_line = 0, int t_end_col = 0) : Equation_AST_Node(std::string t_ast_node_text = "", const std::shared_ptr<std::string> &t_fname=std::shared_ptr<std::string>(), int t_start_line = 0, int t_start_col = 0, int t_end_line = 0, int t_end_col = 0) :
AST_Node(std::move(t_ast_node_text), AST_Node_Type::Equation, t_fname, t_start_line, t_start_col, t_end_line, t_end_col) AST_Node(std::move(t_ast_node_text), AST_Node_Type::Equation, t_fname, t_start_line, t_start_col, t_end_line, t_end_col),
m_oper(Operators::invalid)
{} {}
Operators::Opers m_oper; Operators::Opers m_oper;