[geos-commits] [SCM] GEOS branch master updated. 37b405f4f7cf133c6833dd78dcac5501d861b8e8

[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  37b405f4f7cf133c6833dd78dcac5501d861b8e8 (commit)
      from  2e24b8ed7ba1a670318efb0526fb3392a0f44685 (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 37b405f4f7cf133c6833dd78dcac5501d861b8e8
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Jan 30 11:56:39 2019 -0800

    Quiet warnings, enable ASM build for win64?

diff --git a/include/geos/algorithm/CGAlgorithmsDD.h b/include/geos/algorithm/CGAlgorithmsDD.h
index 9ff8cff..3c46b23 100644
--- a/include/geos/algorithm/CGAlgorithmsDD.h
+++ b/include/geos/algorithm/CGAlgorithmsDD.h
@@ -22,6 +22,7 @@
 #include <geos/algorithm/ttmath/ttmath.h>
 
 // Close to DoubleDouble equivalent used by JTS
+// Usage: ttmath::Big<exponent, mantissa>
 typedef ttmath::Big<TTMATH_BITS(32), TTMATH_BITS(128)> DD;
 //typedef ttmath::Big<TTMATH_BITS(64), TTMATH_BITS(128)> DD;
 //typedef ttmath::Big<TTMATH_BITS(32), TTMATH_BITS(256)> DD;
diff --git a/include/geos/algorithm/ttmath/Makefile.am b/include/geos/algorithm/ttmath/Makefile.am
index 7ed4dc9..e60a3bf 100644
--- a/include/geos/algorithm/ttmath/Makefile.am
+++ b/include/geos/algorithm/ttmath/Makefile.am
@@ -20,4 +20,5 @@ geos_HEADERS = \
 	ttmathuint.h \
 	ttmathuint_noasm.h \
 	ttmathuint_x86.h \
-	ttmathuint_x86_64.h
+	ttmathuint_x86_64.h \
+	ttmathuint_x86_64_msvc.asm
diff --git a/include/geos/geom/util/GeometryTransformer.h b/include/geos/geom/util/GeometryTransformer.h
index cff3ea0..c26ac56 100644
--- a/include/geos/geom/util/GeometryTransformer.h
+++ b/include/geos/geom/util/GeometryTransformer.h
@@ -173,7 +173,7 @@ private:
 	/**
 	 * <code>true</code> if the output from a collection argument should still be a collection
 	 */
-	bool preserveCollections;
+	// bool preserveCollections;
 
 	/**
 	 * <code>true</code> if the type of the input should be preserved
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 30a8426..323f2d9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,7 @@ file(GLOB_RECURSE geos_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 file(GLOB_RECURSE geos_ALL_HEADERS ${CMAKE_SOURCE_DIR}/include/*.h) # fix source_group issue
 
 # Building with Visual C++ x86_64 needs to compile the asm utilities first
-if (MSVC AND ("x${CMAKE_VS_PLATFORM_NAME}" STREQUAL "xx64"))
+if (MSVC AND ("x${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64"))
   set(TTMATH_MSVC64_ASM ttmathuint_x86_64_msvc.asm)
   enable_language(ASM_MASM)
   message(STATUS "Enabled MASM to compile '${TTMATH_MSVC64_ASM}'")
diff --git a/src/geom/util/GeometryTransformer.cpp b/src/geom/util/GeometryTransformer.cpp
index 47e3dbc..cf95b5d 100644
--- a/src/geom/util/GeometryTransformer.cpp
+++ b/src/geom/util/GeometryTransformer.cpp
@@ -58,7 +58,7 @@ GeometryTransformer::GeometryTransformer()
 	inputGeom(nullptr),
 	pruneEmptyGeometry(true),
 	preserveGeometryCollectionType(true),
-	preserveCollections(false),
+	// preserveCollections(false),
 	preserveType(false),
 	skipTransformedInvalidInteriorRings(false)
 {}
diff --git a/src/index/quadtree/Node.cpp b/src/index/quadtree/Node.cpp
index 20a3525..0268b93 100644
--- a/src/index/quadtree/Node.cpp
+++ b/src/index/quadtree/Node.cpp
@@ -24,6 +24,7 @@
 #include <string>
 #include <sstream>
 #include <cassert>
+#include <memory>
 
 #ifndef GEOS_DEBUG
 #define GEOS_DEBUG 0
@@ -47,9 +48,9 @@ Node::createNode(const Envelope& env)
 	Key key(env);
 	std::unique_ptr<Envelope> envelope(new Envelope(key.getEnvelope()));
 	std::unique_ptr<Node> node (
-		new Node(std::move(envelope), key.getLevel())
+	  new Node(std::move(envelope), key.getLevel())
 	);
-	return std::move(node);
+	return node;
 }
 
 /* static public */

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

Summary of changes:
 include/geos/algorithm/CGAlgorithmsDD.h      | 1 +
 include/geos/algorithm/ttmath/Makefile.am    | 3 ++-
 include/geos/geom/util/GeometryTransformer.h | 2 +-
 src/CMakeLists.txt                           | 2 +-
 src/geom/util/GeometryTransformer.cpp        | 2 +-
 src/index/quadtree/Node.cpp                  | 5 +++--
 6 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GEOS