From eda18643df22ddcb524ab7b370f6678e35327db6 Mon Sep 17 00:00:00 2001
From: Daniel Wallin <daniel@boostpro.com>
Date: Mon, 22 Jun 2009 23:28:16 +0200
Subject: [PATCH] Fix tests. Need to contain subconverters.

---
 test/test_collapse_converter.cpp     | 9 +++++----
 test/test_user_defined_converter.cpp | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/test_collapse_converter.cpp b/test/test_collapse_converter.cpp
index b6e7c9f..6a5b3a1 100644
--- a/test/test_collapse_converter.cpp
+++ b/test/test_collapse_converter.cpp
@@ -33,18 +33,19 @@ struct default_converter<X>
         return 2;
     }
 
-    static int compute_score(lua_State* L, int index)
+    int compute_score(lua_State* L, int index)
     {
         return combine_score(
-            default_converter<int>::compute_score(L, index)
-          , default_converter<int>::compute_score(L, index + 1)
-        );
+            c1.compute_score(L, index), c2.compute_score(L, index + 1));
     }
 
     X from(lua_State* L, int index)
     {
         return X(lua_tonumber(L, index), lua_tonumber(L, index + 1));
     }
+
+    default_converter<int> c1;
+    default_converter<int> c2;
 };
 
 } // namespace luabind
diff --git a/test/test_user_defined_converter.cpp b/test/test_user_defined_converter.cpp
index 31a3bf8..643ce4f 100644
--- a/test/test_user_defined_converter.cpp
+++ b/test/test_user_defined_converter.cpp
@@ -20,9 +20,9 @@ template <>
 struct default_converter<X>
   : native_converter_base<X>
 {
-    static int compute_score(lua_State* L, int index)
+    int compute_score(lua_State* L, int index)
     {
-        return default_converter<int>::compute_score(L, index);
+        return cv.compute_score(L, index);
     }
 
     X from(lua_State* L, int index)
@@ -34,6 +34,8 @@ struct default_converter<X>
     {
         lua_pushnumber(L, x.value);
     }
+
+    default_converter<int> cv;
 };
 
 } // namespace luabind
-- 
2.11.4.GIT