Merge release-5-0 into master

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

diff --git a/src/gromacs/analysisdata/tests/histogram.cpp b/src/gromacs/analysisdata/tests/histogram.cpp
index 491568b49f84ef21bc5ce8924de779e728ef9272..f210b4b7adba43a839c4afec591959ef1063674f 100644 (file)
--- a/src/gromacs/analysisdata/tests/histogram.cpp
+++ b/src/gromacs/analysisdata/tests/histogram.cpp
@@ -160,7 +160,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
@@ -246,7 +246,7 @@ class WeightedSimpleInputData
     public:
         static const AnalysisDataTestInput &get()
         {
-#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
             static WeightedSimpleInputData singleton;
             return singleton.data_;
 #else
@@ -283,7 +283,7 @@ class WeightedDataSetInputData
     public:
         static const AnalysisDataTestInput &get()
         {
-#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
             static WeightedDataSetInputData singleton;
             return singleton.data_;
 #else
@@ -455,7 +455,7 @@ class AverageInputData
     public:
         static const AnalysisDataTestInput &get()
         {
-#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
             static AverageInputData singleton;
             return singleton.data_;
 #else