Changeset 493 for library/bdm

Timestamp:

08/11/09 08:32:02 (15 years ago)

Author:

vbarta

Message:

fixed UIREGISTER

Location:

library/bdm/base

Files:

• user_info.cpp (modified) (1 diff)
• user_info.h (modified) (3 diffs)

library/bdm/base/user_info.cpp

@@ -63 +63 @@
 
 void UI::MappedUI::add_class ( const string &class_name, const type_info * const class_type_info, const UI* const ui ) {
-        pair< const string, const UI* const > new_pair = make_pair ( class_name, ui );
-        mapped_strings().insert ( new_pair );
-        mapped_type_infos().insert ( make_pair ( class_type_info, new_pair.first ) );
+        pair< StringToUIMap::iterator, bool> inres =
+                mapped_strings().insert (
+                        StringToUIMap::value_type( class_name, ui ) );
+        if ( inres.second ) {
+                mapped_type_infos().insert (
+                        TypeInfoToStringMap::value_type (
+                                class_type_info, class_name ) );
+        }
 }
 

library/bdm/base/user_info.h

@@ -514 +514 @@
 
 
-//! The only UI descendant class which is not intended for direct use. It should be accessed within the ::UIREGISTER macro only.
+//! The only UI descendant class which is not intended for direct use. It should be accessed within the UIREGISTER macro only.
 //! \ref ui_page
 template<typename T> class ParticularUI : private UI {
-private:
-        //! Default constructor, which is intentionally declared as private
+public:
+        //! Constructor used by the UIREGISTER macro.
         ParticularUI<T> ( const string &class_name ) : UI ( class_name, &typeid ( T ) ) {};
-
-public:
-        //! The only instance of this class (each type T has its own instance) which is used as a factory for processing related UI
-        static const ParticularUI<T>& factory;
 
         //! A method returning a brand new instance of class T, this method is the reason why there have to be a parameterless construcotor in class T
@@ -533 +529 @@
 }
 
+#define CONCATENATE0( name, line ) name##line
+#define CONCATENATE( name, line ) CONCATENATE0( name, line )
+
 /*!
   \def UIREGISTER(class_name)
@@ -543 +542 @@
 */
 #ifndef BDMLIB
-#define UIREGISTER(class_name) template<> const ParticularUI<class_name>& ParticularUI<class_name>::factory = ParticularUI<class_name>(#class_name)
+#define UIREGISTER(class_name) static ParticularUI<class_name> CONCATENATE(registrator, __LINE__)(#class_name)
 #else
 #define UIREGISTER(class_name)