Changeset 11070 for code/branches/cpp11_v3/src/libraries/core/config

Timestamp:

Jan 17, 2016, 8:40:36 PM (10 years ago)

Author:

landauf

Message:

return collections directly instead of begin and end iterators.
this also fixes an issue in MultiStateEngine where two for-loops used begin() instead of end() in the loop condition.

Location:

code/branches/cpp11_v3/src/libraries/core/config

Files:

• ConfigFile.cc (modified) (1 diff)
• ConfigFileSection.h (modified) (1 diff)

code/branches/cpp11_v3/src/libraries/core/config/ConfigFile.cc

@@ -238 +238 @@
             file << section->getFileEntry() << endl;
 
-            for (std::list<ConfigFileEntry*>::const_iterator it_entries = section->getEntriesBegin(); it_entries != section->getEntriesEnd(); ++it_entries)
-                file << (*it_entries)->getFileEntry() << endl;
+            for (ConfigFileEntry* entry : section->getEntries())
+                file << entry->getFileEntry() << endl;
 
             file << endl;

code/branches/cpp11_v3/src/libraries/core/config/ConfigFileSection.h

@@ -161 +161 @@
             std::list<ConfigFileEntry*>& getEntries()
                 { return this->entries_; }
-            /// Returns the begin-iterator of the list of entries in this section.
-            std::list<ConfigFileEntry*>::const_iterator getEntriesBegin() const
-                { return this->entries_.begin(); }
-            /// Returns the end-iterator of the list of entries in this section.
-            std::list<ConfigFileEntry*>::const_iterator getEntriesEnd() const
-                { return this->entries_.end(); }
+            const std::list<ConfigFileEntry*>& getEntries() const
+                { return this->entries_; }
 
             std::list<ConfigFileEntry*>::iterator getOrCreateEntryIterator(const std::string& name, const std::string& fallback, bool bString);