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 eec3aa3f08ca2baf4c1e56d84f0ae1b0eade741e..a1d2755bf48e0f57de17e8d7411f7d498f253d62 100644 (file)
--- a/src/gromacs/analysisdata/tests/arraydata.cpp
+++ b/src/gromacs/analysisdata/tests/arraydata.cpp
@@ -46,10 +46,10 @@
  */
 #include "gmxpre.h"
 
-#include <gtest/gtest.h>
-
 #include "gromacs/analysisdata/arraydata.h"
 
+#include <gtest/gtest.h>
+
 #include "gromacs/analysisdata/tests/datatest.h"
 #include "testutils/testasserts.h"
 
@@ -71,7 +71,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