[geos-commits] [SCM] GEOS branch master updated. 60eb9895f72f8e494897c463d3ac5df83f782b49

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  60eb9895f72f8e494897c463d3ac5df83f782b49 (commit)
      from  6fffe8df845837d0c8e56c90d02402dc21e30ecd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 60eb9895f72f8e494897c463d3ac5df83f782b49
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Nov 24 19:44:43 2020 -0800

    Quiet CI build warnings

diff --git a/src/index/strtree/SimpleSTRtree.cpp b/src/index/strtree/SimpleSTRtree.cpp
index 8103a15..1dbf20e 100644
--- a/src/index/strtree/SimpleSTRtree.cpp
+++ b/src/index/strtree/SimpleSTRtree.cpp
@@ -107,9 +107,9 @@ SimpleSTRtree::createParentNodes(
 {
     assert(!childNodes.empty());
 
-    std::size_t minLeafCount = (std::size_t)std::ceil((double)childNodes.size() / (double)nodeCapacity);
+    std::size_t minLeafCount = (std::size_t)std::ceil((double)(childNodes.size()) / (double)nodeCapacity);
     std::size_t sliceCount = (std::size_t)std::ceil(std::sqrt((double)minLeafCount));
-    std::size_t sliceCapacity = (std::size_t)std::ceil(childNodes.size() / (double)sliceCount);
+    std::size_t sliceCapacity = (std::size_t)std::ceil((double)(childNodes.size()) / (double)sliceCount);
 
     sortNodesX(childNodes);
 
@@ -265,8 +265,10 @@ SimpleSTRtree::query(const geom::Envelope* searchEnv,
 bool
 SimpleSTRtree::remove(const geom::Envelope* itemEnv, void* item)
 {
-    // no implementation of remove() yet!
-    return false;
+    if (itemEnv || item) // no implementation of remove() yet!
+        return false;
+    else
+        return false;
 }
 
 
diff --git a/tests/xmltester/tinyxml2/tinyxml2.cpp b/tests/xmltester/tinyxml2/tinyxml2.cpp
index 414ca6a..f194acc 100755
--- a/tests/xmltester/tinyxml2/tinyxml2.cpp
+++ b/tests/xmltester/tinyxml2/tinyxml2.cpp
@@ -432,17 +432,17 @@ void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length
             --output;
             *output = (char)((input | BYTE_MARK) & BYTE_MASK);
             input >>= 6;
-            // fall through
+            /* FALLTHRU */
         case 3:
             --output;
             *output = (char)((input | BYTE_MARK) & BYTE_MASK);
             input >>= 6;
-            // fall through
+            /* FALLTHRU */
         case 2:
             --output;
             *output = (char)((input | BYTE_MARK) & BYTE_MASK);
             input >>= 6;
-            // fall through
+            /* FALLTHRU */
         case 1:
             --output;
             *output = (char)(input | FIRST_BYTE_MARK[*length]);

-----------------------------------------------------------------------

Summary of changes:
 src/index/strtree/SimpleSTRtree.cpp   | 10 ++++++----
 tests/xmltester/tinyxml2/tinyxml2.cpp |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GEOS