From 968da650b20a385ea60bf56258911575210210d4 Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Sun, 3 Jan 2010 15:48:17 +0000 Subject: [PATCH] Clean up leaking #define's for iterations (n, m) that could mess up subsequently included files such as boost/signals2.hpp --- include/chaiscript/dispatchkit/bind_first.hpp | 5 +++-- include/chaiscript/dispatchkit/function_call_detail.hpp | 1 + include/chaiscript/dispatchkit/proxy_constructors.hpp | 1 + include/chaiscript/dispatchkit/proxy_functions_detail.hpp | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/chaiscript/dispatchkit/bind_first.hpp b/include/chaiscript/dispatchkit/bind_first.hpp index 1d48e32..e5e49c1 100644 --- a/include/chaiscript/dispatchkit/bind_first.hpp +++ b/include/chaiscript/dispatchkit/bind_first.hpp @@ -58,8 +58,9 @@ namespace chaiscript { return boost::bind(f, o BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM(n, param, _)); } - - } +#undef n +#undef m + #endif diff --git a/include/chaiscript/dispatchkit/function_call_detail.hpp b/include/chaiscript/dispatchkit/function_call_detail.hpp index 7d1d0ce..37d9bf3 100644 --- a/include/chaiscript/dispatchkit/function_call_detail.hpp +++ b/include/chaiscript/dispatchkit/function_call_detail.hpp @@ -93,6 +93,7 @@ namespace chaiscript } } +#undef n #endif diff --git a/include/chaiscript/dispatchkit/proxy_constructors.hpp b/include/chaiscript/dispatchkit/proxy_constructors.hpp index d2697f7..fc01871 100644 --- a/include/chaiscript/dispatchkit/proxy_constructors.hpp +++ b/include/chaiscript/dispatchkit/proxy_constructors.hpp @@ -61,6 +61,7 @@ namespace chaiscript } } } +#undef n #endif diff --git a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp index c3c18f1..4cdd180 100644 --- a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp +++ b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp @@ -130,4 +130,6 @@ namespace chaiscript } +#undef n + #endif