Changeset 16088 for trunk/FACT++/src

Timestamp:

05/23/13 19:08:42 (12 years ago)

Author:

tbretz

Message:

Use empty() instead of size() where possible; replaced queues by list where possible

Location:

trunk/FACT++/src

Files:

• datalogger.cc (modified) (4 diffs)
• fitsdump.cc (modified) (4 diffs)
• ftmctrl.cc (modified) (2 diffs)
• ratecontrol.cc (modified) (3 diffs)

trunk/FACT++/src/datalogger.cc

@@ -1556 +1556 @@
     for (list<RunNumberType>::const_iterator it=fRunNumber.begin(); it!=fRunNumber.end(); it++)
         str << " " << it->runNumber;
-    if (fRunNumber.size()==0)
+    if (fRunNumber.empty())
         str << " <none>";
     Message(str);
@@ -1607 +1607 @@
     for (set<string>::const_iterator it=fBlackList.begin(); it != fBlackList.end(); it++)
         Message(" -> "+*it);
-    if (fBlackList.size()==0)
+    if (fBlackList.empty())
         Message(" <empty>");
 
@@ -1613 +1613 @@
     for (set<string>::const_iterator it=fWhiteList.begin(); it != fWhiteList.end(); it++)
         Message(" -> "+*it);
-    if (fWhiteList.size()==0)
+    if (fWhiteList.empty())
         Message(" <empty>");
 
@@ -1621 +1621 @@
     for (set<string>::const_iterator it=fGrouping.begin(); it != fGrouping.end(); it++)
         Message(" -> "+*it);
-    if (fGrouping.size()==0)
+    if (fGrouping.empty())
         Message(" <no grouping>");
 

trunk/FACT++/src/fitsdump.cc

@@ -153 +153 @@
             fout << ::right << setw(20) << it->second.value;
 
-        if (it->second.comment.size()>0)
+        if (!it->second.comment.empty())
             fout << " / " << it->second.comment;
         fout << '\n';
@@ -186 +186 @@
     const fits::Table::Columns &fColMap = GetColumns();
 
-    if (names.size()==0)
+    if (names.empty())
         for (auto it=fColMap.begin(); it!=fColMap.end(); it++)
             if (it->second.num>0)
@@ -509 +509 @@
 
     const vector<MyColumn> vec = InitColumnsRoot(names);
-    if (vec.size()==0)
+    if (vec.empty())
         return;
 
@@ -825 +825 @@
 
     const vector<MyColumn> cols = InitColumns(conf.Vec<string>("col"));
-    if (cols.size()==0)
+    if (cols.empty())
         return false;
 

trunk/FACT++/src/ftmctrl.cc

@@ -2386 +2386 @@
         // ---------- Setup clock conditioner frequencies ----------
         const vector<uint16_t> freq = conf.Vec<uint16_t>("clock-conditioner.frequency");
-        if (freq.size()==0)
+        if (freq.empty())
             T::Warn("No frequencies for the clock-conditioner defined.");
         else
@@ -2432 +2432 @@
         // ---------- Setup run types ---------
         const vector<string> types = conf.Vec<string>("run-type");
-        if (types.size()==0)
+        if (types.empty())
             T::Warn("No run-types defined.");
         else

trunk/FACT++/src/ratecontrol.cc

@@ -100 +100 @@
         //    return;
 
-        if (fThresholds.size()==0)
+        if (!fThresholds.empty())
             return;
 
@@ -371 +371 @@
     int HandleTriggerRates(const EventImp &evt)
     {
-        if (fThresholds.size()==0)
+        if (fThresholds.empty())
             return GetCurrentState();
 
@@ -804 +804 @@
         // ---------- Setup run types ---------
         const vector<string> types = conf.Vec<string>("run-type");
-        if (types.size()==0)
+        if (types.empty())
             Warn("No run-types defined.");
         else