From daacbaa9e083d17682bb75eebeb7a2d75e2e71bd Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Sun, 19 Jul 2009 03:59:58 +0000 Subject: [PATCH] Correct for warnings and errors for the VC++ port. --- include/chaiscript/dispatchkit/bootstrap_stl.hpp | 2 +- include/chaiscript/dispatchkit/proxy_constructors.hpp | 6 +++--- include/chaiscript/dispatchkit/proxy_functions.hpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/chaiscript/dispatchkit/bootstrap_stl.hpp b/include/chaiscript/dispatchkit/bootstrap_stl.hpp index cc26d3e..ad48a97 100644 --- a/include/chaiscript/dispatchkit/bootstrap_stl.hpp +++ b/include/chaiscript/dispatchkit/bootstrap_stl.hpp @@ -100,7 +100,7 @@ namespace chaiscript * http://www.sgi.com/tech/stl/ReversibleContainer.html */ template - ModulePtr reversible_container_type(const std::string &type, ModulePtr m = ModulePtr(new Module())) + ModulePtr reversible_container_type(const std::string &, ModulePtr m = ModulePtr(new Module())) { return m; } diff --git a/include/chaiscript/dispatchkit/proxy_constructors.hpp b/include/chaiscript/dispatchkit/proxy_constructors.hpp index 376f377..e01a4d8 100644 --- a/include/chaiscript/dispatchkit/proxy_constructors.hpp +++ b/include/chaiscript/dispatchkit/proxy_constructors.hpp @@ -25,7 +25,7 @@ namespace chaiscript template Proxy_Function constructor() { - T *f; + T *f = 0; return (build_constructor_(f)); } } @@ -52,10 +52,10 @@ namespace chaiscript * \todo See if it is possible to make this not be a variadic function */ template - Proxy_Function build_constructor_(Class (*f)(BOOST_PP_ENUM_PARAMS(n, Param))) + Proxy_Function build_constructor_(Class (*)(BOOST_PP_ENUM_PARAMS(n, Param))) { typedef boost::shared_ptr (sig)(BOOST_PP_ENUM_PARAMS(n, Param)); - return Proxy_Function(new Proxy_Function_Impl(&(constructor_))); + return Proxy_Function(new Proxy_Function_Impl(boost::function(&(constructor_)))); } } diff --git a/include/chaiscript/dispatchkit/proxy_functions.hpp b/include/chaiscript/dispatchkit/proxy_functions.hpp index 00bef73..260ceb1 100644 --- a/include/chaiscript/dispatchkit/proxy_functions.hpp +++ b/include/chaiscript/dispatchkit/proxy_functions.hpp @@ -399,13 +399,13 @@ namespace chaiscript virtual std::vector get_param_types() const { - Func *f; + Func *f = 0; return build_param_type_list(f); } virtual bool types_match(const std::vector &types) const { - Func *f; + Func *f = 0; return compare_types(f, types); }