Merge branch 'develop' of gitlab.inria.fr:solverstack/ScalFMM into develop

a6cd30cb · COULAUD Olivier · 7c08256f · 82706201 · a6cd30cb · a6cd30cb
Commit a6cd30cb authored Mar 21, 2018 by COULAUD Olivier
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

NEWS.txt NEWS.txt +2 -0

Src/Files/FTreeIO.hpp Src/Files/FTreeIO.hpp +3 -2

No files found.
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -16,6 +16,8 @@ version 1.1
 - std::complex is used for equispaced interpolation
 -

+
+
 1.5
 -----
 - improvements of the MPI version of ScalFMM 

--- a/Src/Files/FTreeIO.hpp
+++ b/Src/Files/FTreeIO.hpp
@@ -5,8 +5,9 @@
 #include <iostream>
 #include <fstream>

-#include "../Containers/FBufferReader.hpp"
-#include "../Containers/FBufferWriter.hpp"
+#include "Utils/FPoint.hpp"
+#include "Containers/FBufferReader.hpp"
+#include "Containers/FBufferWriter.hpp"


 /** This class proposes static methods to save and load