From f1c36d206bb15c97ea9a58116dc8254c36abbbb2 Mon Sep 17 00:00:00 2001
From: Ben Cumming <louncharf@gmail.com>
Date: Thu, 22 Dec 2016 13:42:43 +0100
Subject: [PATCH] fix warnings from tests and link failer for perf test (#135)
* fix signed-vs-unsigned warning in mechanisms unit test
* fix linking error caused by out of date linkage description in CMake for the performance test
---
tests/performance/io/CMakeLists.txt | 5 +----
tests/unit/test_mechanisms.cpp | 6 +++---
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/tests/performance/io/CMakeLists.txt b/tests/performance/io/CMakeLists.txt
index 3fb961fc..4d4b3a5a 100644
--- a/tests/performance/io/CMakeLists.txt
+++ b/tests/performance/io/CMakeLists.txt
@@ -8,10 +8,7 @@ set(DISK_IO_SOURCES
add_executable(disk_io.exe ${DISK_IO_SOURCES} ${HEADERS})
target_link_libraries(disk_io.exe LINK_PUBLIC nestmc)
-
-if(WITH_TBB)
- target_link_libraries(disk_io.exe LINK_PUBLIC ${TBB_LIBRARIES})
-endif()
+target_link_libraries(disk_io.exe LINK_PUBLIC ${EXTERNAL_LIBRARIES})
if(WITH_MPI)
target_link_libraries(disk_io.exe LINK_PUBLIC ${MPI_C_LIBRARIES})
diff --git a/tests/unit/test_mechanisms.cpp b/tests/unit/test_mechanisms.cpp
index 58ffd34e..eaf24d7b 100644
--- a/tests/unit/test_mechanisms.cpp
+++ b/tests/unit/test_mechanisms.cpp
@@ -52,7 +52,7 @@ TEST(mechanisms, helpers) {
// Setup and update mechanism
template<typename T>
-void mech_update(T* mech, int num_iters) {
+void mech_update(T* mech, unsigned num_iters) {
using namespace nest::mc;
std::map<mechanisms::ionKind, mechanisms::ion<typename T::backend>> ions;
@@ -78,11 +78,11 @@ void mech_update(T* mech, int num_iters) {
}
}
- for (auto i = 0; i < mech->node_index_.size(); ++i) {
+ for (auto i=0u; i<mech->node_index_.size(); ++i) {
mech->net_receive(i, 1.);
}
- for (auto i = 0; i < num_iters; ++i) {
+ for (auto i=0u; i<num_iters; ++i) {
mech->nrn_current();
mech->nrn_state();
}
--
GitLab