Merge release-5-0 into master

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

diff --git a/src/gromacs/analysisdata/tests/lifetime.cpp b/src/gromacs/analysisdata/tests/lifetime.cpp
index 7364b1c7d587211a193a180d36b6429923a6cfb8..1549d2a89ad54ce65cfa3018c0e23ec2faaa9412 100644 (file)
--- a/src/gromacs/analysisdata/tests/lifetime.cpp
+++ b/src/gromacs/analysisdata/tests/lifetime.cpp
@@ -67,7 +67,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
@@ -94,7 +94,7 @@ class MultiDataSetInputData
     public:
         static const AnalysisDataTestInput &get()
         {
-#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
             static MultiDataSetInputData singleton;
             return singleton.data_;
 #else