From 442066751271a74da6e12ed54e18807460cb814d Mon Sep 17 00:00:00 2001
From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Tue, 30 Jun 2015 17:06:18 +0000
Subject: [PATCH] #2669, cunit warnings
git-svn-id: http://svn.osgeo.org/postgis/trunk@13765 b70326c6-7e19-0410-871a-916f4a2858ee
---
liblwgeom/cunit/cu_algorithm.c | 10 +++++++---
liblwgeom/cunit/cu_geos_cluster.c | 2 +-
liblwgeom/cunit/cu_unionfind.c | 2 +-
liblwgeom/lwout_twkb.h | 5 ++++-
postgis/lwgeom_inout.c | 1 +
5 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/liblwgeom/cunit/cu_algorithm.c b/liblwgeom/cunit/cu_algorithm.c
index 19996f2f0..dedf13b83 100644
--- a/liblwgeom/cunit/cu_algorithm.c
+++ b/liblwgeom/cunit/cu_algorithm.c
@@ -886,16 +886,20 @@ static void test_geohash_point_as_int(void)
{
unsigned int gh;
POINT2D p;
+ unsigned int rs;
p.x = 50; p.y = 35;
gh = geohash_point_as_int(&p);
- CU_ASSERT_EQUAL(gh, (unsigned int)3440103613);
+ rs = 3440103613;
+ CU_ASSERT_EQUAL(gh, rs);
p.x = 140; p.y = 45;
gh = geohash_point_as_int(&p);
- CU_ASSERT_EQUAL(gh, (unsigned int)3982480893);
+ rs = 3982480893;
+ CU_ASSERT_EQUAL(gh, rs);
p.x = 140; p.y = 55;
gh = geohash_point_as_int(&p);
- CU_ASSERT_EQUAL(gh, (unsigned int)4166944232);
+ rs = 4166944232;
+ CU_ASSERT_EQUAL(gh, rs);
}
static void test_lwgeom_simplify(void)
diff --git a/liblwgeom/cunit/cu_geos_cluster.c b/liblwgeom/cunit/cu_geos_cluster.c
index f54752fa5..39450f002 100644
--- a/liblwgeom/cunit/cu_geos_cluster.c
+++ b/liblwgeom/cunit/cu_geos_cluster.c
@@ -247,4 +247,4 @@ void geos_cluster_suite_setup(void)
PG_ADD_TEST(suite, basic_distance_test);
PG_ADD_TEST(suite, single_input_test);
PG_ADD_TEST(suite, empty_inputs_test);
-};
+}
diff --git a/liblwgeom/cunit/cu_unionfind.c b/liblwgeom/cunit/cu_unionfind.c
index f155a0740..e30a4efce 100644
--- a/liblwgeom/cunit/cu_unionfind.c
+++ b/liblwgeom/cunit/cu_unionfind.c
@@ -65,7 +65,7 @@ static void test_unionfind_ordered_by_cluster(void)
};
uint32_t* actual_ids_by_cluster = UF_ordered_by_cluster(&uf);
- uint32_t expected_ids_by_cluster[] = { 0, 7, 8, 1, 2, 3, 9, 4, 5, 6 };
+ // uint32_t expected_ids_by_cluster[] = { 0, 7, 8, 1, 2, 3, 9, 4, 5, 6 };
// CU_ASSERT_EQUAL(0, memcmp(actual_ids_by_cluster, expected_ids_by_cluster, 10 * sizeof(uint32_t)));
diff --git a/liblwgeom/lwout_twkb.h b/liblwgeom/lwout_twkb.h
index 5b8ff9726..a63561283 100644
--- a/liblwgeom/lwout_twkb.h
+++ b/liblwgeom/lwout_twkb.h
@@ -81,4 +81,7 @@ int lwcollection_to_twkb_buf(const LWCOLLECTION *col, TWKB_GLOBALS *global_value
int lwgeom_write_to_buffer(const LWGEOM *geom, TWKB_GLOBALS *global_values, TWKB_STATE *parent_state);
size_t sizeof_bbox(TWKB_STATE *ts, int ndims);
-void write_bbox(TWKB_STATE *ts, int ndims);
\ No newline at end of file
+void write_bbox(TWKB_STATE *ts, int ndims);
+
+
+
diff --git a/postgis/lwgeom_inout.c b/postgis/lwgeom_inout.c
index 44a37e4dd..11e76e74c 100644
--- a/postgis/lwgeom_inout.c
+++ b/postgis/lwgeom_inout.c
@@ -44,6 +44,7 @@ Datum LWGEOM_to_latlon(PG_FUNCTION_ARGS);
Datum WKBFromLWGEOM(PG_FUNCTION_ARGS);
Datum TWKBFromLWGEOM(PG_FUNCTION_ARGS);
Datum TWKBFromLWGEOMArray(PG_FUNCTION_ARGS);
+Datum TWKBFromTWKBArray(PG_FUNCTION_ARGS);
/*
--
2.40.0