Ticket #1852: use-stl-empty-not-size.patch

trunk/source/graphics/ObjectBase.cpp

@@ -585 +585 @@
         if (prop)
         {
             std::vector<std::set<CStr> > propInitialSelections = initialSelections;
-            if (remainingSelections.size() > 0)
+            if (!remainingSelections.empty())
                 propInitialSelections.push_back(remainingSelections);
 
             std::set<CStr> propRemainingSelections = prop->CalculateRandomRemainingSelections(rng, propInitialSelections);
@@ -611 +611 @@
     // Set of objects already processed, so we don't do them more than once
     std::set<const CObjectBase*> objectsProcessed;
 
-    while (objectsQueue.size())
+    while (!objectsQueue.empty())
     {
         const CObjectBase* obj = objectsQueue.front();
         objectsQueue.pop();

trunk/source/graphics/Unit.cpp

@@ -112 +112 @@
     
     // Use the entity ID as randomization seed (same as when the unit was first created)
     std::set<CStr> remainingSelections = m_Object->m_Base->CalculateRandomRemainingSelections(m_Seed, selections);
-    if (remainingSelections.size() > 0)
+    if (!remainingSelections.empty())
         selections.push_back(remainingSelections);
 
     // If these selections give a different object, change this unit to use it

trunk/source/scriptinterface/DebuggingServer.cpp

@@ -37 +37 @@
     std::stringstream stream;
     uint nbrCallstacksWritten = 0;
     std::list<CThreadDebugger*>::iterator itr;
-    if (m_ThreadDebuggers.size() > 0)
+    if (!m_ThreadDebuggers.empty())
     {
         response << "[";
         for (itr = m_ThreadDebuggers.begin(); itr != m_ThreadDebuggers.end(); itr++)