Merge release-5-0 into master

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

diff --git a/src/gromacs/analysisdata/tests/arraydata.cpp b/src/gromacs/analysisdata/tests/arraydata.cpp
index 37de2b508ba120d3831494a26e22c3f42f37f600..a1d2755bf48e0f57de17e8d7411f7d498f253d62 100644 (file)
--- a/src/gromacs/analysisdata/tests/arraydata.cpp
+++ b/src/gromacs/analysisdata/tests/arraydata.cpp
@@ -44,10 +44,12 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
-#include <gtest/gtest.h>
+#include "gmxpre.h"
 
 #include "gromacs/analysisdata/arraydata.h"
 
+#include <gtest/gtest.h>
+
 #include "gromacs/analysisdata/tests/datatest.h"
 #include "testutils/testasserts.h"
 
@@ -69,8 +71,13 @@ class SimpleInputData
     public:
         static const AnalysisDataTestInput &get()
         {
+#ifndef STATIC_ANON_NAMESPACE_BUG
             static SimpleInputData singleton;
             return singleton.data_;
+#else
+            static SimpleInputData singleton_arraydata;
+            return singleton_arraydata.data_;
+#endif
         }
 
         SimpleInputData() : data_(1, false)