Skip to content
Snippets Groups Projects
Commit 596fda49 authored by Sam Yates's avatar Sam Yates
Browse files

Merge branch 'master' into feature/fvm-multicell

parents 16c625a1 d263aefa
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
using namespace nest::mc::util; using namespace nest::mc::util;
TEST(nop, void_fn) { TEST(nop, void_fn) {
std::function<void ()> f{nop_function}; std::function<void ()> f(nop_function);
EXPECT_TRUE(f); EXPECT_TRUE(f);
f(); // should do nothing f(); // should do nothing
...@@ -20,7 +20,7 @@ TEST(nop, void_fn) { ...@@ -20,7 +20,7 @@ TEST(nop, void_fn) {
EXPECT_FALSE(flag); EXPECT_FALSE(flag);
// with some arguments // with some arguments
std::function<void (int, int)> g{nop_function}; std::function<void (int, int)> g(nop_function);
EXPECT_TRUE(g); EXPECT_TRUE(g);
g(2, 3); // should do nothing g(2, 3); // should do nothing
...@@ -43,7 +43,7 @@ struct check_default { ...@@ -43,7 +43,7 @@ struct check_default {
}; };
TEST(nop, default_return_fn) { TEST(nop, default_return_fn) {
std::function<check_default ()> f{nop_function}; std::function<check_default ()> f(nop_function);
EXPECT_TRUE(f); EXPECT_TRUE(f);
auto result = f(); auto result = f();
...@@ -57,7 +57,7 @@ TEST(nop, default_return_fn) { ...@@ -57,7 +57,7 @@ TEST(nop, default_return_fn) {
result = f(); result = f();
EXPECT_EQ(result.value, 100); EXPECT_EQ(result.value, 100);
std::function<check_default (double, double)> g{nop_function}; std::function<check_default (double, double)> g(nop_function);
EXPECT_TRUE(g); EXPECT_TRUE(g);
result = g(1.4, 1.5); result = g(1.4, 1.5);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment