Workaround for ICC 14 bug

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

diff --git a/src/gromacs/analysisdata/tests/average.cpp b/src/gromacs/analysisdata/tests/average.cpp
index b3b80b9c24d6b318c2cde0018d1967c687917585..f54d6badf810b10238e61f789cf48e1008d0015f 100644 (file)
--- a/src/gromacs/analysisdata/tests/average.cpp
+++ b/src/gromacs/analysisdata/tests/average.cpp
@@ -65,8 +65,13 @@ class SimpleInputData
     public:
         static const AnalysisDataTestInput &get()
         {
+#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG
             static SimpleInputData singleton;
             return singleton.data_;
+#else
+            static SimpleInputData singleton_average;
+            return singleton_average.data_;
+#endif
         }
 
         SimpleInputData() : data_(1, false)
@@ -87,8 +92,13 @@ class MultipointInputData
     public:
         static const AnalysisDataTestInput &get()
         {
+#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG
             static MultipointInputData singleton;
             return singleton.data_;
+#else
+            static MultipointInputData singleton_average;
+            return singleton_average.data_;
+#endif
         }
 
         MultipointInputData() : data_(1, true)
@@ -116,8 +126,13 @@ class MultiDataSetInputData
     public:
         static const AnalysisDataTestInput &get()
         {
+#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG
             static MultiDataSetInputData singleton;
             return singleton.data_;
+#else
+            static MultiDataSetInputData singleton_average;
+            return singleton_average.data_;
+#endif
         }
 
         MultiDataSetInputData() : data_(2, true)