From f4f5415ee082a97f946f8d52fc0f7ff96cce5e49 Mon Sep 17 00:00:00 2001
From: Daniel Wallin <daniel@boostpro.com>
Date: Wed, 11 Feb 2004 20:15:00 +0000
Subject: [PATCH] *** empty log message ***

---
 src/class.cpp | 16 ++++++++--------
 src/scope.cpp |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/class.cpp b/src/class.cpp
index 9671c71..5956d0e 100755
--- a/src/class.cpp
+++ b/src/class.cpp
@@ -240,27 +240,27 @@ namespace luabind { namespace detail {
     }
 
     void class_base::init(
-        LUABIND_TYPE_INFO type
+        LUABIND_TYPE_INFO type_
         , LUABIND_TYPE_INFO holder_type
         , LUABIND_TYPE_INFO const_holder_type
         , void*(*extractor)(void*)
         , const void*(*const_extractor)(void*)
-        , void(*const_converter)(void*,void*)
-        , void(*holder_constructor)(void*,void*)
-        , void(*const_holder_constructor)(void*,void*)
+        , void(*const_converter_)(void*,void*)
+        , void(*holder_constructor_)(void*,void*)
+        , void(*const_holder_constructor_)(void*,void*)
         , void(*destructor)(void*)
         , void(*const_holder_destructor)(void*)
         , int holder_size
         , int holder_alignment)
     {
-        m_registration->m_type = type;
+        m_registration->m_type = type_;
         m_registration->m_holder_type = holder_type;
         m_registration->m_const_holder_type = const_holder_type;
         m_registration->m_extractor = extractor;
         m_registration->m_const_extractor = const_extractor;
-        m_registration->m_const_converter = const_converter;
-        m_registration->m_construct_holder = holder_constructor;
-        m_registration->m_construct_const_holder = const_holder_constructor;
+        m_registration->m_const_converter = const_converter_;
+        m_registration->m_construct_holder = holder_constructor_;
+        m_registration->m_construct_const_holder = const_holder_constructor_;
         m_registration->m_destructor = destructor;
         m_registration->m_const_holder_destructor = const_holder_destructor;
         m_registration->m_holder_size = holder_size;
diff --git a/src/scope.cpp b/src/scope.cpp
index 233fae3..5f0b146 100755
--- a/src/scope.cpp
+++ b/src/scope.cpp
@@ -181,7 +181,7 @@ namespace luabind {
         }
 
         char const* m_name;
-        scope m_scope;
+        detail::scope m_scope;
     };
 
     namespace_::namespace_(char const* name)
@@ -190,7 +190,7 @@ namespace luabind {
     {
     }
 
-    namespace_& namespace_::operator[](scope s)
+    namespace_& namespace_::operator[](detail::scope s)
     {
         m_registration->m_scope.operator,(s);        
         return *this;
-- 
2.11.4.GIT