[geos-commits] [SCM] GEOS branch master updated. 7e4ffa5d1ebab6d61994846a95e66a1c811c868c

[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  7e4ffa5d1ebab6d61994846a95e66a1c811c868c (commit)
       via  777705e81951417dfe3e4d1024d99a5dcea332c6 (commit)
       via  c14208190ad427518a69533fa6dc4e3de9b77639 (commit)
      from  a00aa60de9f1524fbb656a483b69d1afca7aa46d (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 7e4ffa5d1ebab6d61994846a95e66a1c811c868c
Author: Daniel Baston <dbaston at gmail.com>
Date:   Thu May 23 21:20:40 2019 -0400

    Add comment explaining c14208190ad4

diff --git a/tests/unit/tut/tut.hpp b/tests/unit/tut/tut.hpp
index d92822d..08797ea 100644
--- a/tests/unit/tut/tut.hpp
+++ b/tests/unit/tut/tut.hpp
@@ -236,7 +236,8 @@ class test_group : public group_base, public test_group_posix
                 }
 #else
                 bool d;
-                d = delete_obj();
+                d = delete_obj(); // on separate line from declaration to
+                                  // avoid MVSC warning
                 assert(d && "delete failed with SEH disabled: runtime bug?");
 #endif
             }

commit 777705e81951417dfe3e4d1024d99a5dcea332c6
Merge: a00aa60 c142081
Author: Daniel Baston <dbaston at gmail.com>
Date:   Thu May 23 21:18:38 2019 -0400

    Merge remote-tracking branch 'mloskot/ml/fix-msvc-warning-C4189'


commit c14208190ad427518a69533fa6dc4e3de9b77639
Author: Mateusz Łoskot <mateusz at loskot.net>
Date:   Fri May 24 01:37:31 2019 +0200

    Fix MSVC warning C4189: local variable not referenced
    
    This is to avoid flood of 100+ occurrences of the warning.

diff --git a/tests/unit/tut/tut.hpp b/tests/unit/tut/tut.hpp
index e8aabd8..d92822d 100644
--- a/tests/unit/tut/tut.hpp
+++ b/tests/unit/tut/tut.hpp
@@ -235,7 +235,8 @@ class test_group : public group_base, public test_group_posix
                         " an SEH exception");
                 }
 #else
-                bool d = delete_obj();
+                bool d;
+                d = delete_obj();
                 assert(d && "delete failed with SEH disabled: runtime bug?");
 #endif
             }

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

Summary of changes:
 tests/unit/tut/tut.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GEOS