Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / analysisdata / tests / analysisdata.cpp

diff --git a/src/gromacs/analysisdata/tests/analysisdata.cpp b/src/gromacs/analysisdata/tests/analysisdata.cpp
index d8949f6c8a0c73b6e70935289628feaad6e44e63..c1f94697bac778e339a42512283d33c70c010963 100644 (file)
--- a/src/gromacs/analysisdata/tests/analysisdata.cpp
+++ b/src/gromacs/analysisdata/tests/analysisdata.cpp
@@ -47,10 +47,11 @@
  */
 #include "gmxpre.h"
 
+#include "gromacs/analysisdata/analysisdata.h"
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "gromacs/analysisdata/analysisdata.h"
 #include "gromacs/analysisdata/paralleloptions.h"
 #include "gromacs/utility/exceptions.h"
 
@@ -153,7 +154,7 @@ class SimpleInputData
     public:
         static const AnalysisDataTestInput &get()
         {
-#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
             static SimpleInputData singleton;
             return singleton.data_;
 #else
@@ -180,7 +181,7 @@ class DataSetsInputData
     public:
         static const AnalysisDataTestInput &get()
         {
-#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
             static DataSetsInputData singleton;
             return singleton.data_;
 #else
@@ -215,7 +216,7 @@ class MultipointInputData
     public:
         static const AnalysisDataTestInput &get()
         {
-#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
             static MultipointInputData singleton;
             return singleton.data_;
 #else
@@ -252,7 +253,7 @@ class MultipointDataSetsInputData
     public:
         static const AnalysisDataTestInput &get()
         {
-#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
             static MultipointDataSetsInputData singleton;
             return singleton.data_;
 #else