Revert "Build System Updated"

libs/luabind/luabind/iterator_policy.hpp

@@ -5,105 +5,108 @@
 #ifndef LUABIND_ITERATOR_POLICY__071111_HPP
 # define LUABIND_ITERATOR_POLICY__071111_HPP
 
-# include <luabind/config.hpp>           // for LUABIND_ANONYMOUS_FIX
-# include <luabind/detail/push_to_lua.hpp>  // for convert_to_lua
-# include <luabind/detail/policy.hpp>    // for index_map, etc
+# include <luabind/config.hpp>
+# include <luabind/detail/policy.hpp>
+# include <luabind/detail/convert_to_lua.hpp>
 
-# include <new>                          // for operator new
+namespace luabind { namespace detail {
 
-namespace luabind {
-	namespace detail {
+template <class Iterator>
+struct iterator
+{
+    static int next(lua_State* L)
+    {
+        iterator* self = static_cast<iterator*>(
+            lua_touserdata(L, lua_upvalueindex(1)));
 
-		template <class Iterator>
-		struct iterator
-		{
-			static int next(lua_State* L)
-			{
-				iterator* self = static_cast<iterator*>(
-					lua_touserdata(L, lua_upvalueindex(1)));
+        if (self->first != self->last)
+        {
+            convert_to_lua(L, *self->first);
+            ++self->first;
+        }
+        else
+        {
+            lua_pushnil(L);
+        }
 
-				if(self->first != self->last)
-				{
-					push_to_lua(L, *self->first);
-					++self->first;
-				} else
-				{
-					lua_pushnil(L);
-				}
+        return 1;
+    }
 
-				return 1;
-			}
+    static int destroy(lua_State* L)
+    {
+        iterator* self = static_cast<iterator*>(lua_touserdata(L, 1));
+        self->~iterator();
+        return 0;
+    }
 
-			static int destroy(lua_State* L)
-			{
-				iterator* self = static_cast<iterator*>(lua_touserdata(L, 1));
-				self->~iterator();
-				return 0;
-			}
+    iterator(Iterator first, Iterator last)
+      : first(first)
+      , last(last)
+    {}
 
-			iterator(Iterator first, Iterator last)
-				: first(first)
-				, last(last)
-			{}
+    Iterator first;
+    Iterator last;
+};
 
-			Iterator first;
-			Iterator last;
-		};
+template <class Iterator>
+int make_range(lua_State* L, Iterator first, Iterator last)
+{
+    void* storage = lua_newuserdata(L, sizeof(iterator<Iterator>));
+    lua_newtable(L);
+    lua_pushcclosure(L, iterator<Iterator>::destroy, 0);
+    lua_setfield(L, -2, "__gc");
+    lua_setmetatable(L, -2);
+    lua_pushcclosure(L, iterator<Iterator>::next, 1);
+    new (storage) iterator<Iterator>(first, last);
+    return 1;
+}
 
-		template <class Iterator>
-		int make_range(lua_State* L, Iterator first, Iterator last)
-		{
-			void* storage = lua_newuserdata(L, sizeof(iterator<Iterator>));
-			lua_newtable(L);
-			lua_pushcclosure(L, iterator<Iterator>::destroy, 0);
-			lua_setfield(L, -2, "__gc");
-			lua_setmetatable(L, -2);
-			lua_pushcclosure(L, iterator<Iterator>::next, 1);
-			new (storage) iterator<Iterator>(first, last);
-			return 1;
-		}
+template <class Container>
+int make_range(lua_State* L, Container& container)
+{
+    return make_range(L, container.begin(), container.end());
+}
 
-		template <class Container>
-		int make_range(lua_State* L, Container& container)
-		{
-			return make_range(L, container.begin(), container.end());
-		}
+struct iterator_converter
+{
+    typedef iterator_converter type;
 
-		struct iterator_converter
-		{
-			using type = iterator_converter;
+    template <class Container>
+    void apply(lua_State* L, Container& container)
+    {
+        make_range(L, container);
+    }
 
-			template <class Container>
-			void to_lua(lua_State* L, Container& container)
-			{
-				make_range(L, container);
-			}
+    template <class Container>
+    void apply(lua_State* L, Container const& container)
+    {
+        make_range(L, container);
+    }
+};
 
-			template <class Container>
-			void tu_lua(lua_State* L, Container const& container)
-			{
-				make_range(L, container);
-			}
-		};
+struct iterator_policy : conversion_policy<0>
+{
+    static void precall(lua_State*, index_map const&)
+    {}
 
-		struct iterator_policy
-		{
-			template <class T, class Direction>
-			struct specialize
-			{
-				static_assert(std::is_same<Direction, cpp_to_lua>::value, "Iterator policy can only convert from cpp to lua.");
-				using type = iterator_converter;
-			};
-		};
+    static void postcall(lua_State*, index_map const&)
+    {}
 
-	} // namespace detail
-} // namespace luabind
+    template <class T, class Direction>
+    struct apply
+    {
+        typedef iterator_converter type;
+    };
+};
 
-namespace luabind {
+}} // namespace luabind::detail
 
-	using return_stl_iterator = policy_list<converter_policy_injector<0, detail::iterator_policy>>;
+namespace luabind { namespace {
 
-} // namespace luabind
+LUABIND_ANONYMOUS_FIX detail::policy_cons<
+    detail::iterator_policy, detail::null_type> return_stl_iterator;
+
+}} // namespace luabind::unnamed
 
 #endif // LUABIND_ITERATOR_POLICY__071111_HPP