[luabind-cvs] luabind/luabind/luabind adopt_policy.hpp,1.11,1.12 back_reference.hpp,1.3,1.4 container_policy.hpp,1.2,1.3 copy_policy.hpp,1.7,1.8 dependency_policy.hpp,1.6,1.7 discard_result_policy.hpp,1.3,1.4 function.hpp,1.24,1.25 iterator_policy.hpp,1.4,1.5 object.hpp,1.35,1.36 operator.hpp,1.6,1.7 out_value_policy.hpp,1.5,1.6 raw_policy.hpp,1.2,1.3 return_reference_to_policy.hpp,1.2,1.3

[Daniel W. <dan...@us...>]

Update of /cvsroot/luabind/luabind/luabind/luabind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25897

Modified Files:
	adopt_policy.hpp back_reference.hpp container_policy.hpp 
	copy_policy.hpp dependency_policy.hpp 
	discard_result_policy.hpp function.hpp iterator_policy.hpp 
	object.hpp operator.hpp out_value_policy.hpp raw_policy.hpp 
	return_reference_to_policy.hpp 
Log Message:
Made it work on VC6.5 again. This involves changing generate_converter
into apply.


Index: object.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/object.hpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- object.hpp	28 Nov 2005 20:55:34 -0000	1.35
+++ object.hpp	4 Dec 2005 13:56:15 -0000	1.36
@@ -26,6 +26,7 @@
 #include <boost/implicit_cast.hpp> // detail::push()
 #include <boost/ref.hpp> // detail::push()
 #include <boost/mpl/bool.hpp> // value_wrapper_traits specializations
+#include <boost/mpl/apply_wrap.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/optional.hpp>
 
@@ -46,7 +47,8 @@
 
 namespace detail 
 {
-
+  namespace mpl = boost::mpl;
+  
   template<class T, class ConverterGenerator>
   void push_aux(lua_State* interpreter, T& value, ConverterGenerator*)
   {
@@ -56,9 +58,8 @@
         , T
       >::type unwrapped_type;
 
-      typename ConverterGenerator::template generate_converter<
-          unwrapped_type
-        , cpp_to_lua
+      typename mpl::apply_wrap2<
+          ConverterGenerator,unwrapped_type,cpp_to_lua
       >::type cv;
 
       cv.apply(
@@ -739,14 +740,14 @@
     , class ValueWrapper
     , class Policies
     , class ErrorPolicy
-	, class ReturnType
+    , class ReturnType
   >
   ReturnType object_cast_aux(
       ValueWrapper const& value_wrapper
     , T*
     , Policies*
     , ErrorPolicy*
-	, ReturnType*
+    , ReturnType*
   )
   {
       lua_State* interpreter = value_wrapper_traits<ValueWrapper>::interpreter(
@@ -767,10 +768,7 @@
         , Policies
       >::type converter_generator;
 
-      typename converter_generator::template generate_converter<
-          T
-        , lua_to_cpp
-      >::type cv;
+      typename mpl::apply_wrap2<converter_generator, T, lua_to_cpp>::type cv;
 
 #ifndef LUABIND_NO_ERROR_CHECKING
       if (cv.match(interpreter, LUABIND_DECORATE_TYPE(T), -1) < 0)
@@ -831,7 +829,7 @@
       , (T*)0
       , (Policies*)0
       , (detail::throw_error_policy<T>*)0
-	  , (T*)0
+      , (T*)0
     );
 }
 

Index: out_value_policy.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/out_value_policy.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- out_value_policy.hpp	7 Aug 2004 13:37:10 -0000	1.5
+++ out_value_policy.hpp	4 Dec 2005 13:56:15 -0000	1.6
@@ -26,6 +26,7 @@
 
 #include <luabind/config.hpp>
 #include <luabind/detail/policy.hpp>
+#include <boost/mpl/apply_wrap.hpp>
 
 namespace luabind { namespace detail
 {
@@ -77,6 +78,8 @@
 		BOOST_STATIC_CONSTANT(int, value = sizeof(indirect_sizeof_test(LUABIND_DECORATE_TYPE(T))));
 	};
 
+	namespace mpl = boost::mpl;
+	
 	template<int Size, class Policies = detail::null_type>
 	struct out_value_converter
 	{
@@ -84,7 +87,7 @@
 		T& apply(lua_State* L, by_reference<T>, int index)
 		{
 			typedef typename find_conversion_policy<1, Policies>::type converter_policy;
-			typename converter_policy::template generate_converter<T, lua_to_cpp>::type converter;
+			typename mpl::apply_wrap2<converter_policy,T,lua_to_cpp>::type converter;
 			new (m_storage) T(converter.apply(L, LUABIND_DECORATE_TYPE(T), index));
 			return *reinterpret_cast<T*>(m_storage);
 		}
@@ -93,7 +96,7 @@
 		static int match(lua_State* L, by_reference<T>, int index)
 		{
 			typedef typename find_conversion_policy<1, Policies>::type converter_policy;
-			typedef typename converter_policy::template generate_converter<T, lua_to_cpp>::type converter;
+			typedef typename mpl::apply_wrap2<converter_policy,T,lua_to_cpp>::type converter;
 			return converter::match(L, LUABIND_DECORATE_TYPE(T), index);
 		}
 
@@ -101,7 +104,7 @@
 		void converter_postcall(lua_State* L, by_reference<T>, int) 
 		{
 			typedef typename find_conversion_policy<2, Policies>::type converter_policy;
-			typename converter_policy::template generate_converter<T, cpp_to_lua>::type converter;	
+			typename mpl::apply_wrap2<converter_policy,T,cpp_to_lua>::type converter;
 			converter.apply(L, *reinterpret_cast<T*>(m_storage));
 			reinterpret_cast<T*>(m_storage)->~T();
 		}
@@ -110,7 +113,7 @@
 		T* apply(lua_State* L, by_pointer<T>, int index)
 		{
 			typedef typename find_conversion_policy<1, Policies>::type converter_policy;
-			typename converter_policy::template generate_converter<T, lua_to_cpp>::type converter;
+			typename mpl::apply_wrap2<converter_policy,T,lua_to_cpp>::type converter;
 			new (m_storage) T(converter.apply(L, LUABIND_DECORATE_TYPE(T), index));
 			return reinterpret_cast<T*>(m_storage);
 		}
@@ -119,7 +122,7 @@
 		static int match(lua_State* L, by_pointer<T>, int index)
 		{
 			typedef typename find_conversion_policy<1, Policies>::type converter_policy;
-			typedef typename converter_policy::template generate_converter<T, lua_to_cpp>::type converter;
+			typedef typename mpl::apply_wrap2<converter_policy,T,lua_to_cpp>::type converter;
 			return converter::match(L, LUABIND_DECORATE_TYPE(T), index);
 		}
 
@@ -127,7 +130,7 @@
 		void converter_postcall(lua_State* L, by_pointer<T>, int)
 		{
 			typedef typename find_conversion_policy<2, Policies>::type converter_policy;
-			typename converter_policy::template generate_converter<T, cpp_to_lua>::type converter;	
+			typename mpl::apply_wrap2<converter_policy,T,cpp_to_lua>::type converter;
 			converter.apply(L, *reinterpret_cast<T*>(m_storage));
 			reinterpret_cast<T*>(m_storage)->~T();
 		}
@@ -145,7 +148,7 @@
 		struct can_only_convert_from_lua_to_cpp {};
 
 		template<class T, class Direction>
-		struct generate_converter
+		struct apply
 		{
 			typedef typename boost::mpl::if_<boost::is_same<lua_to_cpp, Direction>
 				, typename boost::mpl::if_<boost::mpl::or_<is_nonconst_reference<T>, is_nonconst_pointer<T> >
@@ -177,7 +180,7 @@
 		void converter_postcall(lua_State* L, by_reference<T>, int) 
 		{
 			typedef typename find_conversion_policy<1, Policies>::type converter_policy;
-			typename converter_policy::template generate_converter<T, cpp_to_lua>::type converter;	
+			typename mpl::apply_wrap2<converter_policy,T,cpp_to_lua>::type converter;
 			converter.apply(L, *reinterpret_cast<T*>(m_storage));
 			reinterpret_cast<T*>(m_storage)->~T();
 		}
@@ -199,7 +202,7 @@
 		void converter_postcall(lua_State* L, by_pointer<T>, int) 
 		{
 			typedef typename find_conversion_policy<1, Policies>::type converter_policy;
-			typename converter_policy::template generate_converter<T, cpp_to_lua>::type converter;	
+			typename mpl::apply_wrap2<converter_policy,T,cpp_to_lua>::type converter;
 			converter.apply(L, *reinterpret_cast<T*>(m_storage));
 			reinterpret_cast<T*>(m_storage)->~T();
 		}
@@ -218,7 +221,7 @@
 		struct can_only_convert_from_lua_to_cpp {};
 
 		template<class T, class Direction>
-		struct generate_converter
+		struct apply
 		{
 			typedef typename boost::mpl::if_<boost::is_same<lua_to_cpp, Direction>
 				, typename boost::mpl::if_<boost::mpl::or_<is_nonconst_reference<T>, is_nonconst_pointer<T> >
@@ -236,19 +239,31 @@
 {
 	template<int N>
 	detail::policy_cons<detail::out_value_policy<N>, detail::null_type> 
-	out_value(boost::arg<N>) { return detail::policy_cons<detail::out_value_policy<N>, detail::null_type>(); }
+	out_value(LUABIND_PLACEHOLDER_ARG(N)) 
+	{ 
+		return detail::policy_cons<detail::out_value_policy<N>, detail::null_type>(); 
+	}
 
 	template<int N, class Policies>
 	detail::policy_cons<detail::out_value_policy<N, Policies>, detail::null_type> 
-	out_value(boost::arg<N>, const Policies&) { return detail::policy_cons<detail::out_value_policy<N, Policies>, detail::null_type>(); }
+	out_value(LUABIND_PLACEHOLDER_ARG(N), const Policies&) 
+	{ 
+		return detail::policy_cons<detail::out_value_policy<N, Policies>, detail::null_type>(); 
+	}
 
 	template<int N>
 	detail::policy_cons<detail::pure_out_value_policy<N>, detail::null_type> 
-	pure_out_value(boost::arg<N>) { return detail::policy_cons<detail::pure_out_value_policy<N>, detail::null_type>(); }
+	pure_out_value(LUABIND_PLACEHOLDER_ARG(N)) 
+	{ 
+		return detail::policy_cons<detail::pure_out_value_policy<N>, detail::null_type>(); 
+	}
 
 	template<int N, class Policies>
 	detail::policy_cons<detail::pure_out_value_policy<N, Policies>, detail::null_type> 
-	pure_out_value(boost::arg<N>, const Policies&) { return detail::policy_cons<detail::pure_out_value_policy<N, Policies>, detail::null_type>(); }
+	pure_out_value(LUABIND_PLACEHOLDER_ARG(N), const Policies&) 
+	{ 
+		return detail::policy_cons<detail::pure_out_value_policy<N, Policies>, detail::null_type>(); 
+	}
 }
 
 #endif // LUABIND_OUT_VALUE_POLICY_HPP_INCLUDED

Index: raw_policy.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/raw_policy.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- raw_policy.hpp	7 Aug 2004 13:37:10 -0000	1.2
+++ raw_policy.hpp	4 Dec 2005 13:56:15 -0000	1.3
@@ -51,7 +51,7 @@
 		static void postcall(lua_State*, const index_map&) {}
 
 		template<class T, class Direction>
-		struct generate_converter
+		struct apply
 		{
 			typedef raw_converter type;
 		};
@@ -66,7 +66,7 @@
 		detail::raw_policy<N>
 	  , detail::null_type
 	>
-	inline raw(boost::arg<N>) 
+	inline raw(LUABIND_PLACEHOLDER_ARG(N))
 	{ 
 		return detail::policy_cons<
 			detail::raw_policy<N>

Index: operator.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/operator.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- operator.hpp	3 Jan 2005 11:15:21 -0000	1.6
+++ operator.hpp	4 Dec 2005 13:56:15 -0000	1.7
@@ -25,6 +25,7 @@
 
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/identity.hpp>
+#include <boost/mpl/apply_wrap.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <luabind/detail/other.hpp>
 #include <luabind/raw_policy.hpp>
@@ -175,6 +176,8 @@
     {
     }
 
+    namespace mpl = boost::mpl;
+
     template<class T, class Policies>
     inline void operator_result(lua_State* L, T const& x, Policies*)
     {
@@ -183,10 +186,7 @@
           , Policies
         >::type cv_policy;
 
-        typename cv_policy::template generate_converter<
-            T
-          , cpp_to_lua
-        >::type cv;
+        typename mpl::apply_wrap2<cv_policy,T,cpp_to_lua>::type cv;
 
         cv.apply(L, x);
     }

Index: back_reference.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/back_reference.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- back_reference.hpp	28 Nov 2005 20:55:34 -0000	1.3
+++ back_reference.hpp	4 Dec 2005 13:56:15 -0000	1.4
@@ -50,27 +50,27 @@
   }
 
   template<class T>
-  wrap_base const* get_back_reference_aux(T const* p)
+  wrap_base const* get_back_reference_aux1(T const* p)
   {
       return get_back_reference_aux0(p, boost::is_polymorphic<T>());
   }
 
   template<class T>
-  wrap_base const* get_back_reference_aux(T const& x, mpl::true_)
+  wrap_base const* get_back_reference_aux2(T const& x, mpl::true_)
   {
-      return get_back_reference_aux(get_pointer(x));
+      return get_back_reference_aux1(get_pointer(x));
   }
 
   template<class T>
-  wrap_base const* get_back_reference_aux(T const& x, mpl::false_)
+  wrap_base const* get_back_reference_aux2(T const& x, mpl::false_)
   {
-      return get_back_reference_aux(&x);
+      return get_back_reference_aux1(&x);
   }
 
   template<class T>
   wrap_base const* get_back_reference(T const& x)
   {
-      return detail::get_back_reference_aux(
+      return detail::get_back_reference_aux2(
           x
         , has_get_pointer<T>()
       );

Index: discard_result_policy.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/discard_result_policy.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- discard_result_policy.hpp	14 Jun 2003 21:05:01 -0000	1.3
+++ discard_result_policy.hpp	4 Dec 2005 13:56:15 -0000	1.4
@@ -43,7 +43,7 @@
 		struct can_only_convert_from_cpp_to_lua {};
 
 		template<class T, class Direction>
-		struct generate_converter
+		struct apply
 		{
 			typedef typename boost::mpl::if_<boost::is_same<Direction, cpp_to_lua>
 				, discard_converter

Index: copy_policy.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/copy_policy.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- copy_policy.hpp	14 Jun 2003 21:05:01 -0000	1.7
+++ copy_policy.hpp	4 Dec 2005 13:56:15 -0000	1.8
@@ -99,7 +99,7 @@
 		static void postcall(lua_State*, const index_map&) {}
 
 		template<class T, class Direction>
-		struct generate_converter
+		struct apply
 		{
 			typedef typename boost::mpl::if_<boost::is_same<Direction, cpp_to_lua>
 					, typename boost::mpl::if_<boost::is_pointer<T>
@@ -116,7 +116,10 @@
 {
 	template<int N>
 	detail::policy_cons<detail::copy_policy<N>, detail::null_type> 
-	copy(boost::arg<N>) { return detail::policy_cons<detail::copy_policy<N>, detail::null_type>(); }
+	copy(LUABIND_PLACEHOLDER_ARG(N)) 
+	{ 
+		return detail::policy_cons<detail::copy_policy<N>, detail::null_type>(); 
+	}
 }
 
 #endif // LUABIND_COPY_POLICY_HPP_INCLUDED

Index: function.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/function.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- function.hpp	7 Aug 2004 13:37:10 -0000	1.24
+++ function.hpp	4 Dec 2005 13:56:15 -0000	1.25
@@ -35,6 +35,7 @@
 #include <boost/preprocessor/repetition/enum.hpp> 
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/cat.hpp>
+#include <boost/mpl/apply_wrap.hpp>
 
 #include <luabind/detail/signature_match.hpp>
 #include <luabind/detail/call_function.hpp>
@@ -48,6 +49,8 @@
 	namespace detail
 	{
 
+		namespace mpl = boost::mpl;
+	  
 		namespace free_functions
 		{
 
@@ -107,7 +110,9 @@
 		// returns generates functions that calls function pointers
 
 #define LUABIND_DECL(z, n, text) typedef typename find_conversion_policy<n + 1, Policies>::type BOOST_PP_CAT(converter_policy,n); \
-		typename BOOST_PP_CAT(converter_policy,n)::template generate_converter<A##n, lua_to_cpp>::type BOOST_PP_CAT(c,n);
+		typename mpl::apply_wrap2< \
+			BOOST_PP_CAT(converter_policy,n), BOOST_PP_CAT(A,n), lua_to_cpp \
+		>::type BOOST_PP_CAT(c,n);
 
 #define LUABIND_ADD_INDEX(z,n,text) + BOOST_PP_CAT(converter_policy,n)::has_arg
 #define LUABIND_INDEX_MAP(z,n,text) 1 BOOST_PP_REPEAT(n, LUABIND_ADD_INDEX, _)
@@ -333,16 +338,10 @@
 template<class Policies BOOST_PP_COMMA_IF(BOOST_PP_ITERATION()) BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), class A)>
 static int call(T(*f)(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), A)), lua_State* L, const Policies*)
 {
-/*	typedef typename get_policy<0, Policies>::type ret_policy;
-	typedef typename ret_policy::head return_value_converter_intermediate;
-	typedef typename return_value_converter_intermediate::template generate_converter<T, cpp_to_lua>::type ret_conv;*/
-
 	int nargs = lua_gettop(L);
 
-//	typedef typename get_policy_list<0, Policies>::type policy_list_ret;
-//	typedef typename find_converter_policy<policy_list_ret>::type converter_policy_ret;
 	typedef typename find_conversion_policy<0, Policies>::type converter_policy_ret;
-	typename converter_policy_ret::template generate_converter<T, cpp_to_lua>::type converter_ret;
+	typename mpl::apply_wrap2<converter_policy_ret,T,cpp_to_lua>::type converter_ret;
 
 	BOOST_PP_REPEAT(BOOST_PP_ITERATION(), LUABIND_DECL, _)
 		converter_ret.apply(L, f

Index: container_policy.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/container_policy.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- container_policy.hpp	14 Jun 2003 21:05:01 -0000	1.2
+++ container_policy.hpp	4 Dec 2005 13:56:15 -0000	1.3
@@ -26,9 +26,12 @@
 
 #include <luabind/config.hpp>
 #include <luabind/detail/policy.hpp>
+#include <boost/mpl/apply_wrap.hpp>
 
 namespace luabind { namespace detail {
 
+	namespace mpl = boost::mpl;
+
 	template<class Policies>
 	struct container_converter_lua_to_cpp
 	{
@@ -38,7 +41,7 @@
 			typedef typename T::value_type value_type;
 
 			typedef typename find_conversion_policy<1, Policies>::type converter_policy;
-			typename converter_policy::template generate_converter<value_type, lua_to_cpp>::type converter;
+			typename mpl::apply_wrap2<converter_policy,value_type,lua_to_cpp>::type converter;
 
 			T container;
 
@@ -77,7 +80,7 @@
 			typedef typename T::value_type value_type;
 
 			typedef typename find_conversion_policy<1, Policies>::type converter_policy;
-			typename converter_policy::template generate_converter<value_type, cpp_to_lua>::type converter;
+			typename mpl::apply_wrap2<converter_policy,value_type,lua_to_cpp>::type converter;
 
 			lua_newtable(L);
 
@@ -104,7 +107,7 @@
 		struct only_accepts_nonconst_pointers {};
 
 		template<class T, class Direction>
-		struct generate_converter
+		struct apply
 		{
 			typedef typename boost::mpl::if_<boost::is_same<lua_to_cpp, Direction>
 				, container_converter_lua_to_cpp<Policies>
@@ -119,11 +122,17 @@
 {
 	template<int N>
 	detail::policy_cons<detail::container_policy<N, detail::null_type>, detail::null_type> 
-	container(boost::arg<N>) { return detail::policy_cons<detail::container_policy<N, detail::null_type>, detail::null_type>(); }
+	container(LUABIND_PLACEHOLDER_ARG(N)) 
+	{ 
+		return detail::policy_cons<detail::container_policy<N, detail::null_type>, detail::null_type>(); 
+	}
 
 	template<int N, class Policies>
 	detail::policy_cons<detail::container_policy<N, Policies>, detail::null_type> 
-	container(boost::arg<N>, const Policies&) { return detail::policy_cons<detail::container_policy<N, Policies>, detail::null_type>(); }
+	container(LUABIND_PLACEHOLDER_ARG(N), const Policies&) 
+	{ 
+		return detail::policy_cons<detail::container_policy<N, Policies>, detail::null_type>(); 
+	}
 }
 
 #endif // LUABIND_CONTAINER_POLICY_HPP_INCLUDED

Index: return_reference_to_policy.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/return_reference_to_policy.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- return_reference_to_policy.hpp	14 Jun 2003 21:05:02 -0000	1.2
+++ return_reference_to_policy.hpp	4 Dec 2005 13:56:15 -0000	1.3
@@ -52,7 +52,7 @@
 		}
 
 		template<class T, class Direction>
-		struct generate_converter
+		struct apply
 		{
 			typedef return_reference_to_converter<Direction> type;
 		};
@@ -63,7 +63,10 @@
 {
 	template<int N>
 	detail::policy_cons<detail::return_reference_to_policy<N>, detail::null_type> 
-	return_reference_to(boost::arg<N>) { return detail::policy_cons<detail::return_reference_to_policy<N>, detail::null_type>(); }
+	return_reference_to(LUABIND_PLACEHOLDER_ARG(N)) 
+	{ 
+		return detail::policy_cons<detail::return_reference_to_policy<N>, detail::null_type>(); 
+	}
 }
 
 #endif // LUABIND_RETURN_REFERENCE_TO_POLICY_HPP_INCLUDED

Index: dependency_policy.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/dependency_policy.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dependency_policy.hpp	28 Nov 2005 20:55:34 -0000	1.6
+++ dependency_policy.hpp	4 Dec 2005 13:56:15 -0000	1.7
@@ -62,7 +62,7 @@
 		};
 
 		template<int N>
-		size_char_array<N> deduce_size(boost::arg<N>);
+		size_char_array<N> deduce_size(LUABIND_PLACEHOLDER_ARG(N));
 
 		template<class T>
 		struct get_index_workaround
@@ -97,14 +97,14 @@
 {
 	template<int A, int B>
 	detail::policy_cons<detail::dependency_policy<A, B>, detail::null_type>
-	dependency(boost::arg<A>, boost::arg<B>)
+	dependency(LUABIND_PLACEHOLDER_ARG(A), LUABIND_PLACEHOLDER_ARG(B))
 	{
 		return detail::policy_cons<detail::dependency_policy<A, B>, detail::null_type>();
 	}
 
 	template<int A>
 	detail::policy_cons<detail::dependency_policy<0, A>, detail::null_type>
-	return_internal_reference(boost::arg<A>)
+	return_internal_reference(LUABIND_PLACEHOLDER_ARG(A))
 	{
 		return detail::policy_cons<detail::dependency_policy<0, A>, detail::null_type>();
 	}

Index: adopt_policy.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/adopt_policy.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- adopt_policy.hpp	28 Nov 2005 20:55:34 -0000	1.11
+++ adopt_policy.hpp	4 Dec 2005 13:56:14 -0000	1.12
@@ -135,7 +135,7 @@
 		struct only_accepts_nonconst_pointers {};
 
 		template<class T, class Direction>
-		struct generate_converter
+		struct apply
 		{
 			typedef luabind::detail::is_nonconst_pointer<T> is_nonconst_p;
 			typedef typename boost::mpl::if_<is_nonconst_p, adopt_pointer<Direction>, only_accepts_nonconst_pointers>::type type;
@@ -148,7 +148,10 @@
 {
 	template<int N>
 	detail::policy_cons<detail::adopt_policy<N>, detail::null_type> 
-	adopt(boost::arg<N>) { return detail::policy_cons<detail::adopt_policy<N>, detail::null_type>(); }
+	adopt(LUABIND_PLACEHOLDER_ARG(N))
+	{ 
+		return detail::policy_cons<detail::adopt_policy<N>, detail::null_type>(); 
+	}
 }
 
 #endif // LUABIND_ADOPT_POLICY_HPP_INCLUDE

Index: iterator_policy.hpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/luabind/iterator_policy.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- iterator_policy.hpp	28 Nov 2005 20:55:34 -0000	1.4
+++ iterator_policy.hpp	4 Dec 2005 13:56:15 -0000	1.5
@@ -101,7 +101,7 @@
 		static void postcall(lua_State*, const index_map&) {}
 
 		template<class T, class Direction>
-		struct generate_converter
+		struct apply
 		{
 			typedef iterator_converter type;
 		};