Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / analysisdata / tests / datatest.h

diff --git a/src/gromacs/analysisdata/tests/datatest.h b/src/gromacs/analysisdata/tests/datatest.h
index 5b9c210a581826b575a7d3f270f3637dd020495e..6d85dd6b05c080827daef2ca26cb912b77ab9b2b 100644 (file)
--- a/src/gromacs/analysisdata/tests/datatest.h
+++ b/src/gromacs/analysisdata/tests/datatest.h
@@ -47,16 +47,15 @@
 
 #include <gtest/gtest.h>
 
-#include "gromacs/legacyheaders/types/simple.h"
-
 #include "gromacs/analysisdata/dataframe.h"
 #include "gromacs/utility/gmxassert.h"
+#include "gromacs/utility/real.h"
 
 #include "testutils/refdata.h"
 
 // currently the bug manifests itself only in AbstractAnalysisData testing
-#if (defined __ICL && __ICL >= 1400) || (defined __ICC & __ICC >= 1400)
-#define INTEL_STATIC_ANON_NAMESPACE_BUG //see #1558 for details
+#if (defined __ICL && __ICL >= 1400) || (defined __ICC && __ICC >= 1400) || (defined __PATHSCALE__)
+#define STATIC_ANON_NAMESPACE_BUG //see #1558 for details
 #endif
 
 namespace gmx