From 267063bb32af0106c87706b3d5c2f85e9b6d81d9 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <i-bird@localhost.localdomain>
Date: Mon, 15 Aug 2016 15:08:33 +0200
Subject: [PATCH] Simplify map_list
---
example/Vector/4_complex_prop/main.cpp | 2 +-
src/Vector/vector_dist.hpp | 4 +++-
src/Vector/vector_dist_unit_test.hpp | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/example/Vector/4_complex_prop/main.cpp b/example/Vector/4_complex_prop/main.cpp
index 7d9edeb5c..915f2868e 100644
--- a/example/Vector/4_complex_prop/main.cpp
+++ b/example/Vector/4_complex_prop/main.cpp
@@ -181,7 +181,7 @@ int main(int argc, char* argv[])
// Particles are redistribued across the processors but only the scalar,vector, and point properties
// are transfert
- vd.map_list<KillParticle,scalar,vector,point>();
+ vd.map_list<scalar,vector,point>();
// Synchronize the ghost
vd.ghost_get<scalar,vector,point>();
diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp
index 437d6ea3a..309563ee1 100644
--- a/src/Vector/vector_dist.hpp
+++ b/src/Vector/vector_dist.hpp
@@ -1132,8 +1132,10 @@ public:
* contain non local particles
*
*/
- template<typename obp = KillParticle,unsigned int ... prp> void map_list()
+ template<unsigned int ... prp> void map_list()
{
+ typedef KillParticle obp;
+
// outgoing particles-id
openfpm::vector<size_t> out_part;
diff --git a/src/Vector/vector_dist_unit_test.hpp b/src/Vector/vector_dist_unit_test.hpp
index d548e0e17..d5c12a1df 100644
--- a/src/Vector/vector_dist_unit_test.hpp
+++ b/src/Vector/vector_dist_unit_test.hpp
@@ -1275,7 +1275,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_periodic_map_list )
++it;
}
- vd.map_list<KillParticle,0,1>();
+ vd.map_list<0,1>();
// sync the ghost
vd.ghost_get<0>();
--
GitLab