From 13d46a77ff33a1a4d9916eafd79864f06b6f5360 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <i-bird@private-incardon-3.mpi-cbg.de>
Date: Fri, 15 Apr 2016 12:49:29 +0200
Subject: [PATCH] Fixing for gcc 4.9.2
---
openfpm_data | 2 +-
src/Vector/vector_dist.hpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/openfpm_data b/openfpm_data
index fe595a5a..fcbefd1d 160000
--- a/openfpm_data
+++ b/openfpm_data
@@ -1 +1 @@
-Subproject commit fe595a5ac0d1cfd5bb53c25728d795fbc20aabef
+Subproject commit fcbefd1d58de10a473e9753645253afb4416b89a
diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp
index 6eb6d579..748e1b3f 100644
--- a/src/Vector/vector_dist.hpp
+++ b/src/Vector/vector_dist.hpp
@@ -1040,7 +1040,7 @@ public:
{
auto key = it.get();
- cell_list.add(this->template getPos(key), key.getKey());
+ cell_list.add(this->getPos(key), key.getKey());
++it;
}
@@ -1111,7 +1111,7 @@ public:
vect_dist_key_dx key = it_p.get();
// Get the position of the particles
- Point<dim, St> p = this->template getPos(key);
+ Point<dim, St> p = this->getPos(key);
// Clear the neighborhood of the particle
verlet.get(key.getKey()).clear();
@@ -1129,7 +1129,7 @@ public:
continue;
}
- Point<dim, St> q = this->template getPos(nnp);
+ Point<dim, St> q = this->getPos(nnp);
if (p.distance2(q) < r_cut2)
verlet.get(key.getKey()).add(nnp);
@@ -1300,7 +1300,7 @@ public:
while (it.isNext())
{
- size_t v = cdsm.getCell(this->template getPos(it.get()));
+ size_t v = cdsm.getCell(this->getPos(it.get()));
dec.addComputationCost(v, 1);
--
GitLab