[geos-commits] [SCM] GEOS branch master updated. 545f6452bd758fdbdc2e09bf2062da25c58b6462

git at osgeo.org git at osgeo.org
Wed Jan 22 09:17:57 PST 2020


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  545f6452bd758fdbdc2e09bf2062da25c58b6462 (commit)
       via  d0c4b936ff25a5cd6e35f836632ae2d02b6de581 (commit)
       via  4b902f01efadd214ffce8e14af5ba6fc871ac60b (commit)
       via  eda128a16d12df1aaf622463dcb1d4c7214980ab (commit)
      from  7d02cb4ab4bc1e62bb36c51a26511ba7a9697f28 (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 545f6452bd758fdbdc2e09bf2062da25c58b6462
Merge: 7d02cb4 d0c4b93
Author: Dan Baston <dbaston at gmail.com>
Date:   Wed Jan 22 12:17:32 2020 -0500

    Merge remote-tracking branch 'origin/msvc-warnings'


commit d0c4b936ff25a5cd6e35f836632ae2d02b6de581
Author: Dan Baston <dbaston at gmail.com>
Date:   Tue Jan 21 13:44:15 2020 -0500

    Declare nan as constexpr

diff --git a/tests/unit/capi/GEOSEqualsTest.cpp b/tests/unit/capi/GEOSEqualsTest.cpp
index b056240..36b1fe0 100644
--- a/tests/unit/capi/GEOSEqualsTest.cpp
+++ b/tests/unit/capi/GEOSEqualsTest.cpp
@@ -127,7 +127,7 @@ void object::test<4>
 {
     GEOSCoordSequence* cs = GEOSCoordSeq_create(5, 2);
 
-    double nan = std::numeric_limits<double>::quiet_NaN();
+    constexpr double nan = std::numeric_limits<double>::quiet_NaN();
     GEOSCoordSeq_setX(cs, 0, 1);
     GEOSCoordSeq_setY(cs, 0, 1);
     for(unsigned int i = 1; i < 4; ++i) {
diff --git a/tests/unit/capi/GEOSIntersectsTest.cpp b/tests/unit/capi/GEOSIntersectsTest.cpp
index fa2a1b4..efcc3e5 100644
--- a/tests/unit/capi/GEOSIntersectsTest.cpp
+++ b/tests/unit/capi/GEOSIntersectsTest.cpp
@@ -127,7 +127,7 @@ void object::test<4>
 {
     GEOSCoordSequence* cs = GEOSCoordSeq_create(5, 2);
 
-    double nan = std::numeric_limits<double>::quiet_NaN();
+    constexpr double nan = std::numeric_limits<double>::quiet_NaN();
     GEOSCoordSeq_setX(cs, 0, 1);
     GEOSCoordSeq_setY(cs, 0, 1);
     for(unsigned int i = 1; i < 4; ++i) {

commit 4b902f01efadd214ffce8e14af5ba6fc871ac60b
Author: Dan Baston <dbaston at gmail.com>
Date:   Tue Jan 21 13:30:50 2020 -0500

    Update deprecated throw() specifications

diff --git a/include/geos/algorithm/NotRepresentableException.h b/include/geos/algorithm/NotRepresentableException.h
index 47207be..f203b72 100644
--- a/include/geos/algorithm/NotRepresentableException.h
+++ b/include/geos/algorithm/NotRepresentableException.h
@@ -36,7 +36,7 @@ class GEOS_DLL NotRepresentableException: public util::GEOSException {
 public:
     NotRepresentableException();
     NotRepresentableException(std::string msg);
-    ~NotRepresentableException() throw() override {}
+    ~NotRepresentableException() noexcept override {}
 };
 
 } // namespace geos::algorithm
diff --git a/include/geos/io/ParseException.h b/include/geos/io/ParseException.h
index b713b77..86e73c4 100644
--- a/include/geos/io/ParseException.h
+++ b/include/geos/io/ParseException.h
@@ -43,7 +43,7 @@ public:
 
     ParseException(const std::string& msg, double num);
 
-    ~ParseException() throw() override {}
+    ~ParseException() noexcept override {}
 
 private:
     static std::string stringify(double num);
diff --git a/include/geos/util/AssertionFailedException.h b/include/geos/util/AssertionFailedException.h
index a41c8d4..f4ca30c 100644
--- a/include/geos/util/AssertionFailedException.h
+++ b/include/geos/util/AssertionFailedException.h
@@ -41,7 +41,7 @@ public:
         GEOSException("AssertionFailedException", msg)
     {}
 
-    ~AssertionFailedException() throw() override {}
+    ~AssertionFailedException() noexcept override {}
 };
 
 } // namespace geos.util
diff --git a/include/geos/util/IllegalArgumentException.h b/include/geos/util/IllegalArgumentException.h
index f47647d..6afdd3f 100644
--- a/include/geos/util/IllegalArgumentException.h
+++ b/include/geos/util/IllegalArgumentException.h
@@ -43,7 +43,7 @@ public:
         GEOSException("IllegalArgumentException", msg)
     {}
 
-    ~IllegalArgumentException() throw() override {}
+    ~IllegalArgumentException() noexcept override {}
 };
 
 } // namespace geos::util
diff --git a/include/geos/util/IllegalStateException.h b/include/geos/util/IllegalStateException.h
index 60f8ed3..55c23e5 100644
--- a/include/geos/util/IllegalStateException.h
+++ b/include/geos/util/IllegalStateException.h
@@ -36,7 +36,7 @@ public:
         GEOSException("IllegalStateException", msg)
     {}
 
-    ~IllegalStateException() throw() override {}
+    ~IllegalStateException() noexcept override {}
 };
 
 } // namespace geos::util
diff --git a/include/geos/util/TopologyException.h b/include/geos/util/TopologyException.h
index ed4d473..bf0c843 100644
--- a/include/geos/util/TopologyException.h
+++ b/include/geos/util/TopologyException.h
@@ -50,7 +50,7 @@ public:
         pt(newPt)
     {}
 
-    ~TopologyException() throw() override {}
+    ~TopologyException() noexcept override {}
     geom::Coordinate&
     getCoordinate()
     {
diff --git a/include/geos/util/UnsupportedOperationException.h b/include/geos/util/UnsupportedOperationException.h
index e3939ca..8ac72bc 100644
--- a/include/geos/util/UnsupportedOperationException.h
+++ b/include/geos/util/UnsupportedOperationException.h
@@ -45,7 +45,7 @@ public:
         GEOSException("UnsupportedOperationException", msg)
     {}
 
-    ~UnsupportedOperationException() throw() override {}
+    ~UnsupportedOperationException() noexcept override {}
 };
 
 } // namespace geos::util

commit eda128a16d12df1aaf622463dcb1d4c7214980ab
Author: Dan Baston <dbaston at gmail.com>
Date:   Tue Jan 21 13:31:30 2020 -0500

    Remove unreachable code

diff --git a/capi/geos_ts_c.cpp b/capi/geos_ts_c.cpp
index e60e1bd..0dfdc6f 100644
--- a/capi/geos_ts_c.cpp
+++ b/capi/geos_ts_c.cpp
@@ -1367,7 +1367,6 @@ extern "C" {
             const Polygon* p = dynamic_cast<const Polygon*>(g1);
             if(!p) {
                 throw IllegalArgumentException("Argument is not a Polygon");
-                return -1;
             }
             return static_cast<int>(p->getNumInteriorRing());
         });

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

Summary of changes:
 capi/geos_ts_c.cpp                                 | 1 -
 include/geos/algorithm/NotRepresentableException.h | 2 +-
 include/geos/io/ParseException.h                   | 2 +-
 include/geos/util/AssertionFailedException.h       | 2 +-
 include/geos/util/IllegalArgumentException.h       | 2 +-
 include/geos/util/IllegalStateException.h          | 2 +-
 include/geos/util/TopologyException.h              | 2 +-
 include/geos/util/UnsupportedOperationException.h  | 2 +-
 tests/unit/capi/GEOSEqualsTest.cpp                 | 2 +-
 tests/unit/capi/GEOSIntersectsTest.cpp             | 2 +-
 10 files changed, 9 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list