summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2012-05-31 15:32:19 -0400
committerTavian Barnes <tavianator@gmail.com>2012-05-31 15:32:39 -0400
commitdb3b3ce81f03eafb626455f60ca1d2cf2f4a1176 (patch)
tree295df0c8d72a35914cb4d0dd45722d0d68ef92bc
parent1d2bcd60d3e0cb8649ba5d2ae8672457849656ce (diff)
downloadvz-db3b3ce81f03eafb626455f60ca1d2cf2f4a1176.tar.xz
Fix compatibility with new GCCs.
-rw-r--r--.gitignore2
-rw-r--r--src/vZ/Adaptive.hpp10
-rw-r--r--src/vZ/Simple.hpp2
3 files changed, 8 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 291d1aa..821853f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
/ltmain.sh
/m4
/missing
+/test-driver
/ylwrap
Makefile
Makefile.in
@@ -17,6 +18,7 @@ Makefile.in
# Files created by `make check'
/tests/*-test
/tests/*.log
+/tests/*.trs
# pkg-config files
*.pc
diff --git a/src/vZ/Adaptive.hpp b/src/vZ/Adaptive.hpp
index a422bb4..b940df0 100644
--- a/src/vZ/Adaptive.hpp
+++ b/src/vZ/Adaptive.hpp
@@ -103,14 +103,14 @@ namespace vZ
// Attempt the integration step in a loop
while (true) {
if (m_k1Set) {
- k = calculateK(m_k1, y, m_a);
+ k = this->calculateK(m_k1, y, m_a);
} else if (m_fsal) {
- k = calculateK(y, m_a);
+ k = this->calculateK(y, m_a);
} else {
- k = calculateK(m_a);
- y = calculateY(k, m_b);
+ k = this->calculateK(m_a);
+ y = this->calculateY(k, m_b);
}
- Y yStar = calculateY(k, m_bStar);
+ Y yStar = this->calculateY(k, m_bStar);
// Get an error estimate
diff --git a/src/vZ/Simple.hpp b/src/vZ/Simple.hpp
index 211acd6..8148ed3 100644
--- a/src/vZ/Simple.hpp
+++ b/src/vZ/Simple.hpp
@@ -56,7 +56,7 @@ namespace vZ
void
GenericSimpleIntegrator<Y>::step()
{
- this->y(calculateY(calculateK(m_a), m_b));
+ this->y(this->calculateY(this->calculateK(m_a), m_b));
this->x(this->x() + this->h());
}
}