Commit d07c83a4 by Michael Turner

Merge branch 'fix/boost-error' into 'master'

Fix boost compiler error after merging SessionFunction class

See merge request !825
2 parents 34f284c5 f077d8d0
......@@ -34,6 +34,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <FieldUtils/Interpolator.h>
#include <SolverUtils/Core/SessionFunction.h>
#include <LibUtilities/BasicUtils/VmathArray.hpp>
......
......@@ -37,7 +37,6 @@
#ifndef NEKTAR_SOLVERUTILS_SESSIONFUNCTION_H
#define NEKTAR_SOLVERUTILS_SESSIONFUNCTION_H
#include <FieldUtils/Interpolator.h>
#include <LibUtilities/BasicUtils/FieldIO.h>
#include <LibUtilities/BasicUtils/FileSystem.h>
#include <LibUtilities/BasicUtils/NekFactory.hpp>
......@@ -51,6 +50,11 @@
namespace Nektar
{
namespace FieldUtils
{
class Interpolator;
}
namespace SolverUtils
{
......
......@@ -36,6 +36,7 @@
#ifndef NEKTAR_SOLVERUTILS_EQUATIONSYSTEM_H
#define NEKTAR_SOLVERUTILS_EQUATIONSYSTEM_H
#include <SolverUtils/Core/SessionFunction.h>
#include <LibUtilities/Communication/Comm.h>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/NekFactory.hpp>
......@@ -48,7 +49,6 @@
#include <MultiRegions/ExpList.h>
#include <SolverUtils/SolverUtilsDeclspec.h>
#include <SolverUtils/Core/Misc.h>
#include <SolverUtils/Core/SessionFunction.h>
namespace Nektar
{
......
......@@ -33,6 +33,7 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <FieldUtils/Interpolator.h>
#include <SolverUtils/Forcing/Forcing.h>
using namespace std;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!