From 26544c07173e99ecae6d73e3ce8edf107e12a579 Mon Sep 17 00:00:00 2001 From: Claus-Justus Heine <Claus-Justus.Heine@IANS.Uni-Stuttgart.DE> Date: Sat, 3 Jan 2015 09:25:51 +0000 Subject: [PATCH] evaluate.h cannot be used with standard C++ as it uses C99 features which are STILL not supported by C++ (maybe this will change with C++ 14 but who knows ...) --- alberta/src/Common/alberta.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/alberta/src/Common/alberta.h b/alberta/src/Common/alberta.h index b4ad952..48d0828 100644 --- a/alberta/src/Common/alberta.h +++ b/alberta/src/Common/alberta.h @@ -5813,6 +5813,8 @@ extern void dxtools_drdv(DXTOOLS_WINDOW *win, const DOF_REAL_D_VEC *u); #include "el_vec.h" /* element vectors and matrices */ -#include "evaluate.h" /* evaluation of finite element functions */ +#ifndef __cplusplus +# include "evaluate.h" /* evaluation of finite element functions */ +#endif #endif /* !_ALBERTA_H_ */ -- GitLab