celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [7/7] celix git commit: CELIX-289: fix warnings
Date Thu, 12 Nov 2015 16:40:56 GMT
CELIX-289: fix warnings


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/37720bd6
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/37720bd6
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/37720bd6

Branch: refs/heads/feature/CELIX-272_synchronization_service_registry
Commit: 37720bd6d904aff6504a5fc5ab19e57eba3b8bf5
Parents: f4aabbe
Author: Bjoern Petri <bpetri@apache.org>
Authored: Wed Nov 11 22:34:33 2015 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Thu Nov 12 17:40:27 2015 +0100

----------------------------------------------------------------------
 utils/private/test/celix_threads_test.cpp | 1 +
 utils/private/test/hash_map_test.cpp      | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/37720bd6/utils/private/test/celix_threads_test.cpp
----------------------------------------------------------------------
diff --git a/utils/private/test/celix_threads_test.cpp b/utils/private/test/celix_threads_test.cpp
index 29e4475..620b42b 100644
--- a/utils/private/test/celix_threads_test.cpp
+++ b/utils/private/test/celix_threads_test.cpp
@@ -288,6 +288,7 @@ static void * thread_test_func_exit(void *) {
 	*pi = 666;
 
 	celixThread_exit(pi);
+	return NULL;
 }
 
 static void * thread_test_func_detach(void *) {

http://git-wip-us.apache.org/repos/asf/celix/blob/37720bd6/utils/private/test/hash_map_test.cpp
----------------------------------------------------------------------
diff --git a/utils/private/test/hash_map_test.cpp b/utils/private/test/hash_map_test.cpp
index 024655d..2051942 100644
--- a/utils/private/test/hash_map_test.cpp
+++ b/utils/private/test/hash_map_test.cpp
@@ -167,10 +167,10 @@ TEST(hash_map, create){
 	CHECK(map != NULL);
 	LONGS_EQUAL(0, map->size);
 	// This fails on windows due to dllimport providing a proxy for exported functions.
-	CHECK_EQUAL(hashMap_equals, map->equalsKey);
-	CHECK_EQUAL(hashMap_equals, map->equalsValue);
-	CHECK_EQUAL(hashMap_hashCode, map->hashKey);
-	CHECK_EQUAL(hashMap_hashCode, map->hashValue);
+	CHECK_EQUAL(&hashMap_equals, map->equalsKey);
+	CHECK_EQUAL(&hashMap_equals, map->equalsValue);
+	CHECK_EQUAL(&hashMap_hashCode, map->hashKey);
+	CHECK_EQUAL(&hashMap_hashCode, map->hashValue);
 }
 
 TEST(hash_map, size){


Mime
View raw message