From 70e3c9025567d89d47dd344b8d243ab23dd5dc6a Mon Sep 17 00:00:00 2001
From: Sam Yates <halfflat@gmail.com>
Date: Fri, 25 Sep 2020 20:56:38 +0200
Subject: [PATCH] Fix error introduced by PR merge. (#1162)
---
test/unit/test_recipe.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/test/unit/test_recipe.cpp b/test/unit/test_recipe.cpp
index 958b66e9..888b4da8 100644
--- a/test/unit/test_recipe.cpp
+++ b/test/unit/test_recipe.cpp
@@ -1,5 +1,8 @@
#include "../gtest.h"
+#include <any>
+#include <vector>
+
#include <arbor/common_types.hpp>
#include <arbor/domain_decomposition.hpp>
#include <arbor/load_balance.hpp>
@@ -52,7 +55,7 @@ namespace {
cell_size_type num_targets(cell_gid_type gid) const override {
return num_targets_[gid];
}
- arb::util::any get_global_properties(cell_kind) const override {
+ std::any get_global_properties(cell_kind) const override {
arb::cable_cell_global_properties a;
a.default_parameters = arb::neuron_parameter_defaults;
return a;
@@ -290,4 +293,4 @@ TEST(recipe, connections)
EXPECT_THROW(simulation(recipe_4, decomp_4, context), arb::bad_connection_target_lid);
}
-}
\ No newline at end of file
+}
--
GitLab