Changeset 949

Timestamp:

05/18/10 20:51:13 (15 years ago)

Author:

mido

Message:

another patch of log_levels in user_info.h where a small piece of code was forgotten in the previous facelift of UI
also, DS adjusted to a new UI::GET policy concerning RVs

Location:

library/bdm/base

Files:

• bdmbase.cpp (modified) (1 diff)
• user_info.h (modified) (1 diff)

library/bdm/base/bdmbase.cpp

@@ -538 +538 @@
 
 void DS::from_setting ( const Setting &set ) {
-        shared_ptr<RV> r = UI::build<RV> ( set, "drv", UI::optional );
-        if ( r )        
-                set_drv ( *r, RV() );
+        RV rv;
+        if( UI::get( rv, set, "drv", UI::optional ) )
+                set_drv ( rv, RV() );
 }
 

library/bdm/base/user_info.h

@@ -312 +312 @@
         //! This method converts a Setting into a real scalar   
         static void from_setting ( double &real, const Setting &element );
-        //! This method converts a Setting into a class T descendant
+        //! This method converts a Setting into a staticallly allocated root descendant 
         static void from_setting ( root &instance, const Setting &element );
-        //! This method converts a Setting into a class T descendant
+        //! This method converts a Setting into a log_level
+        //!
+        //! Data is stored in string which has different meaning than usally. For that reason, a specialized
+        //! method is necessary here to avoid the default call of "const SettingResolver link ( element );", 
+        //! which would lead to erroneous behaviour in this case
+        template<class T> static void from_setting ( log_level_base<T> &log_level, const Setting &element ) {
+                assert_type( element, Setting::TypeString );
+                call_from_setting( log_level, element );
+        }
+
+        //! This method converts a Setting into a dynamically allocated root descendant
         template<class T> static void from_setting ( T* &instance, const Setting &element ) {
                 const SettingResolver link ( element );