Return-Path: X-Original-To: apmail-celix-commits-archive@www.apache.org Delivered-To: apmail-celix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 70D951841C for ; Thu, 12 Nov 2015 16:40:51 +0000 (UTC) Received: (qmail 87455 invoked by uid 500); 12 Nov 2015 16:40:51 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 87395 invoked by uid 500); 12 Nov 2015 16:40:51 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 87236 invoked by uid 99); 12 Nov 2015 16:40:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Nov 2015 16:40:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 06B93E01D9; Thu, 12 Nov 2015 16:40:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pnoltes@apache.org To: commits@celix.apache.org Date: Thu, 12 Nov 2015 16:40:56 -0000 Message-Id: In-Reply-To: <686edd2ffc28429ba77f4d6d0173a2bb@git.apache.org> References: <686edd2ffc28429ba77f4d6d0173a2bb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/7] celix git commit: CELIX-289: fix warnings 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 Authored: Wed Nov 11 22:34:33 2015 +0100 Committer: Pepijn Noltes 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){