[Boost-commit] svn:boost r47185 - in sandbox/mirror/boost/mirror: . detail

From: chochlik_at_[hidden]
Date: 2008-07-07 09:06:31

Author: matus.chochlik
Date: 2008-07-07 09:06:30 EDT (Mon, 07 Jul 2008)
New Revision: 47185
URL: http://svn.boost.org/trac/boost/changeset/47185

Log:
minor bug fix

Text files modified: 
   sandbox/mirror/boost/mirror/detail/argument_type_list.hpp    |     4 ++--                                    
   sandbox/mirror/boost/mirror/detail/meta_type_registering.hpp |    20 ++++++++++++++++----                    
   sandbox/mirror/boost/mirror/meta_data_fwd.hpp                |     2 +-                                      
   sandbox/mirror/boost/mirror/meta_namespace.hpp               |     9 +++++++--                               
   4 files changed, 26 insertions(+), 9 deletions(-)

Modified: sandbox/mirror/boost/mirror/detail/argument_type_list.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/detail/argument_type_list.hpp	(original)
+++ sandbox/mirror/boost/mirror/detail/argument_type_list.hpp	2008-07-07 09:06:30 EDT (Mon, 07 Jul 2008)
@@ -36,7 +36,7 @@
 {
         typedef typename ::boost::mpl::remove_if<
                         ArgTypeList,
-			is_typelist_null_type<::boost::mpl::_>
+			is_typelist_null_type< ::boost::mpl::_ >
 	>::type type;
 };
 
@@ -96,7 +96,7 @@
 		>(append_arg_typename<FullOrBase>(str));
                 //
                 // append the last argument
-		typedef mpl::back<ArgTypeList>::type last_arg_type;
+		typedef typename mpl::back<ArgTypeList>::type last_arg_type;
                 str.append(BOOST_MIRRORED_TYPE(last_arg_type)::get_name(full_or_base));
         }
 

Modified: sandbox/mirror/boost/mirror/detail/meta_type_registering.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/detail/meta_type_registering.hpp	(original)
+++ sandbox/mirror/boost/mirror/detail/meta_type_registering.hpp	2008-07-07 09:06:30 EDT (Mon, 07 Jul 2008)
@@ -28,14 +28,19 @@
         detail::registered_type_info<Type>
 >
 {
+	typedef detail::full_name_builder<
+        	typename detail::registered_type_info<Type>::scope,
+        	detail::registered_type_info<Type>
+	> base_class;
+
         inline static const bstring& base_name(void)
         {
-		return get_name(mpl::false_());
+		return base_class::get_name(mpl::false_());
         }
 
         inline static const bstring& full_name(void)
         {
-		return get_name(mpl::true_());
+		return base_class::get_name(mpl::true_());
         }
 
         typedef detail::registered_type_info<Type> base_info;
@@ -92,7 +97,14 @@
 #define BOOST_MIRROR_GET_TYPEDEFD_TYPE_SELECTOR(NAMESPACE, TYPEDEFD_NAME) \
         ::boost::mirror::typedef_::TYPEDEFD_NAME < \
                 BOOST_MIRRORED_NAMESPACE( NAMESPACE ) \
-	> \
+	> 
+
+/** Macro that expands into a typedef-ined type selector
+ */
+#define BOOST_MIRROR_GET_TYPEDEFD_TYPE_SELECTOR_GS(TYPEDEFD_NAME) \
+	::boost::mirror::typedef_::TYPEDEFD_NAME < \
+		BOOST_MIRRORED_GLOBAL_SCOPE() \
+	> 
 
 /** Macro for registering typedef-ined types in the global scope
  */
@@ -105,7 +117,7 @@
         } /* namespace typedef_ */ \
         namespace detail { \
         template <> struct registered_type_info< \
-		BOOST_MIRROR_GET_TYPEDEFD_TYPE_SELECTOR( :: , TYPEDEFD_NAME) \
+		BOOST_MIRROR_GET_TYPEDEFD_TYPE_SELECTOR_GS(TYPEDEFD_NAME) \
 	> \
         { \
                 typedef BOOST_MIRRORED_GLOBAL_SCOPE() scope; \

Modified: sandbox/mirror/boost/mirror/meta_data_fwd.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/meta_data_fwd.hpp	(original)
+++ sandbox/mirror/boost/mirror/meta_data_fwd.hpp	2008-07-07 09:06:30 EDT (Mon, 07 Jul 2008)
@@ -35,7 +35,7 @@
 
 #define BOOST_MIRRORED_GLOBAL_SCOPE() \
         ::boost::mirror::meta_namespace< \
-		::boost::mirror::namespace_ ## ::_ \
+		::boost::mirror::namespace_ ::_ \
 	>
 
 namespace detail {

Modified: sandbox/mirror/boost/mirror/meta_namespace.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/meta_namespace.hpp	(original)
+++ sandbox/mirror/boost/mirror/meta_namespace.hpp	2008-07-07 09:06:30 EDT (Mon, 07 Jul 2008)
@@ -44,14 +44,19 @@
         NamespacePlaceholder
 >
 {
+	typedef  detail::full_name_builder<
+        	meta_namespace<typename NamespacePlaceholder::parent_placeholder>,
+        	NamespacePlaceholder
+	> base_class;
+
         inline static const bstring& base_name(void)
         {
-		return get_name(mpl::false_());
+		return base_class::get_name(mpl::false_());
         }
 
         inline static const bstring& full_name(void)
         {
-		return get_name(mpl::true_());
+		return base_class::get_name(mpl::true_());
         }