#2669, cunit warnings

git-svn-id: http://svn.osgeo.org/postgis/trunk@13765 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/liblwgeom/cunit/cu_algorithm.c b/liblwgeom/cunit/cu_algorithm.c
index 19996f2f0ccd894a4a728bd9c0098162a9c5bbd6..dedf13b83fa188132e3f44fbaf459b52a8ff8325 100644 (file)
--- 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 f54752fa58fe02c894a7e7bfb0d6329291bda0d6..39450f00218f601946776ef70609cdc7d585f96c 100644 (file)
--- 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 f155a07404d272951d1687c9c8d579deb12f6efa..e30a4efce27531d924f78588dd926d67c6341d0e 100644 (file)
--- 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 5b8ff97263e01c3ad6777591fcccad299c83e424..a635612830314992ec5482b684b47cb80d671942 100644 (file)
--- 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 44a37e4dda81ee6abc9f25a47e1c07d643f1cfb6..11e76e74cc45f50c8faaeebbdaf74636d0b0f163 100644 (file)
--- 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);
 
 
 /*