Merge branch 'fix-issue-849' of cvvergara/geos into master

Scheggetta · Aug 31, 2018 · 4919f0d · 4919f0d
2 parents 8a9600b + 55d8d35
commit 4919f0d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/linearref/ExtractLineByLocation.cpp b/src/linearref/ExtractLineByLocation.cpp
@@ -106,7 +106,7 @@ LineString* ExtractLineByLocation::computeLine(const LinearLocation& start, cons
 
 	if (lastSegmentIndex >= coordinates->size())
     {
-        assert(coordinates->size() > 0);
+        assert(!coordinates->isEmpty());
         lastSegmentIndex = coordinates->size() - indexStep;
     }
 
@@ -126,7 +126,7 @@ LineString* ExtractLineByLocation::computeLine(const LinearLocation& start, cons
     }
 
 	// ensure there is at least one coordinate in the result
-	if (newCoordinateArray.size() == 0)
+	if (newCoordinateArray.isEmpty())
     {
 		newCoordinateArray.add(start.getCoordinate(line));
     }

diff --git a/tests/unit/tut/tut_console_reporter.hpp b/tests/unit/tut/tut_console_reporter.hpp
@@ -160,7 +160,7 @@ class console_reporter : public tut::callback
     {
         os << std::endl;
 
-        if (not_passed.size() > 0)
+        if (!not_passed.empty())
         {
             not_passed_list::const_iterator i = not_passed.begin();
             while (i != not_passed.end())

diff --git a/tests/unit/tut/tut_cppunit_reporter.hpp b/tests/unit/tut/tut_cppunit_reporter.hpp
@@ -84,7 +84,7 @@ class cppunit_reporter : public tut::callback
         *stream_ << "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>" << std::endl
                  << "<TestRun>" << std::endl;
 
-        if (failed_tests_.size() > 0)
+        if (!failed_tests_.empty())
         {
             *stream_ << "  <FailedTests>" << std::endl;
 
@@ -145,7 +145,7 @@ class cppunit_reporter : public tut::callback
         }
 
         /* *********************** passed tests ***************************** */
-        if (passed_tests_.size() > 0) {
+        if (!passed_tests_.empty()) {
             *stream_ << "  <SuccessfulTests>" << std::endl;
 
             for (unsigned int i=0; i<passed_tests_.size(); i++)

diff --git a/tests/xmltester/Stackwalker.cpp b/tests/xmltester/Stackwalker.cpp
@@ -1435,7 +1435,7 @@ static bool GetModuleListTH32(ModuleList& modules, DWORD pid, FILE *fLogFile)
   CloseHandle(hSnap);
   FreeLibrary(hToolhelp);
 
-  return modules.size() != 0;
+  return !modules.empty();
 }  // GetModuleListTH32
 
 
@@ -1526,7 +1526,7 @@ static bool GetModuleListPSAPI(ModuleList &modules, DWORD pid, HANDLE hProcess,
   free(tt);
   free(hMods);
 
-  return modules.size() != 0;
+  return !modules.empty();
 }  // GetModuleListPSAPI
 
 
@@ -2067,7 +2067,7 @@ static void ShowStackRM( HANDLE hThread, CONTEXT& c, FILE *fLogFile, PREAD_PROCE
 
 
 
-    if ( symSearchPath.size() > 0 ) // if we added anything, we have a trailing semicolon
+    if ( !symSearchPath.empty() ) // if we added anything, we have a trailing semicolon
       symSearchPath = symSearchPath.substr( 0, symSearchPath.size() - 1 );
 
     // why oh why does SymInitialize() want a writeable string?