Changeset 534

Timestamp:

08/14/09 15:55:25 (15 years ago)

Author:

vbarta

Message:

removed unused overload of UI::build, changed another one to return shared_ptr<T>

Files:

• library/bdm/base/user_info.h (modified) (4 diffs)

library/bdm/base/user_info.h

@@ -349 +349 @@
 
 protected:
-        //! Default constructor for internal use only, see \sa ParticularUI<T>
+        //! Constructor for internal use only, see \sa ParticularUI<T>
         UI ( const string& class_name, const type_info * const class_type_info ) {
                 MappedUI::add_class ( class_name, class_type_info, this );
@@ -356 +356 @@
 public:
 
-        //! Enumerical type used to determine whether the data for concrete Settingis is compulsory or optional
+        //! Enum type used to determine whether the data for concrete Settingis is compulsory or optional
         enum SettingPresence { optional, compulsory } ;
 
@@ -382 +382 @@
         //! The new instance of type T* is constructed and initialized with values stored in the Setting element[index]
         //!
-        //! If there is not any sub-element indexed by #index, the null pointer is returned.
-        template<class T> static T* build ( const Setting &element, const int index, SettingPresence settingPresence = optional ) {
+        //! If there is not any sub-element indexed by #index, and settingPresence is #optional, an empty shared_ptr<T> is returned. When settingPresence is #compulsory, the returned shared_ptr<T> is never empty (an exception is thrown when the object isn't found).
+        template<class T>
+        static shared_ptr<T> build ( const Setting &element, const int index, SettingPresence settingPresence = optional ) {
                 if ( element.getLength() <= index ) {
                         if ( settingPresence == optional )
-                                return NULL;
+                                return shared_ptr<T>();
                         else {
                                 stringstream stream;
@@ -394 +395 @@
                 }
 
-                T* instance;
+                shared_ptr<T> instance;
                 from_setting<T> ( instance, to_child_setting ( element, index ) );
                 return instance;
-        }
-
-        //! The new instance of type T* is constructed and initialized with values stored in the Setting element
-        template<class T> static T* build ( const Setting &element ) {
-                T* instance;
-                from_setting<T> ( instance,  element );
-                return instance;
-
         }