Changeset 16427

Timestamp:

05/29/13 14:03:15 (12 years ago)

Author:

tbretz

Message:

Replaced push_back by emplace_back and size() by empty() where reasonable; fixed a possible problem with invalidated iterators in SetStr

File:

• trunk/Mars/mcore/ofits.h (modified) (5 diffs)

trunk/Mars/mcore/ofits.h

@@ -63 +63 @@
         {
             key = Trim(key);
-            if (key.size()==0)
+            if (key.empty())
             {
 #ifdef __EXCEPTIONS
@@ -195 +195 @@
 
             sout << "= ";
-            sout << (value[0]=='\''?std::left:std::right);
+            sout << (!value.empty() && value[0]=='\''?std::left:std::right);
             sout << setw(20) << value << std::left;
 
-            if (comment.size()>0)
+            if (!comment.empty())
                 sout << " / " << comment;
 
@@ -428 +428 @@
     bool SetStr(const string &key, string s, const string &comment="")
     {
-        for (string::iterator c=s.begin(); c<s.end(); c++)
-            if (*c=='\'')
-                s.insert(c++, '\'');
+        for (uint i=0; i<s.length(); i++)
+            if (s[i]=='\'')
+                s.insert(i++, "\'");
 
         return Set(key, true, "'"+s+"'", comment);
@@ -492 +492 @@
         Set("END");
         while (fKeys.size()%36!=0)
-            fKeys.push_back(Key());
+            fKeys.emplace_back();
     }
 
@@ -596 +596 @@
 
         Table::Column col;
+
         col.name   = name;
         col.type   = typechar;