From e87f8933383eb54d03bf664daa6aa815d7ec100d Mon Sep 17 00:00:00 2001 From: Erik Lindahl Date: Sun, 7 Sep 2014 11:29:44 -0700 Subject: [PATCH] Enable static anon namespace workaround on pathscale The pathscale compilers suffer from the same static anon namespace bug as the intel ones. Since the bug is no longer Intel-specific, the INTEL_ prefix in the macro has been removed. Change-Id: Id87c9386cb831ba43ae05b2006dcfd0f1bf06be8 --- src/gromacs/analysisdata/tests/analysisdata.cpp | 8 ++++---- src/gromacs/analysisdata/tests/arraydata.cpp | 2 +- src/gromacs/analysisdata/tests/average.cpp | 6 +++--- src/gromacs/analysisdata/tests/datatest.h | 4 ++-- src/gromacs/analysisdata/tests/histogram.cpp | 8 ++++---- src/gromacs/analysisdata/tests/lifetime.cpp | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/gromacs/analysisdata/tests/analysisdata.cpp b/src/gromacs/analysisdata/tests/analysisdata.cpp index 9149a5177c..6891bcef40 100644 --- a/src/gromacs/analysisdata/tests/analysisdata.cpp +++ b/src/gromacs/analysisdata/tests/analysisdata.cpp @@ -151,7 +151,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 @@ -178,7 +178,7 @@ class DataSetsInputData public: static const AnalysisDataTestInput &get() { -#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG +#ifndef STATIC_ANON_NAMESPACE_BUG static DataSetsInputData singleton; return singleton.data_; #else @@ -213,7 +213,7 @@ class MultipointInputData public: static const AnalysisDataTestInput &get() { -#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG +#ifndef STATIC_ANON_NAMESPACE_BUG static MultipointInputData singleton; return singleton.data_; #else @@ -250,7 +250,7 @@ class MultipointDataSetsInputData public: static const AnalysisDataTestInput &get() { -#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG +#ifndef STATIC_ANON_NAMESPACE_BUG static MultipointDataSetsInputData singleton; return singleton.data_; #else diff --git a/src/gromacs/analysisdata/tests/arraydata.cpp b/src/gromacs/analysisdata/tests/arraydata.cpp index 08db023952..184a0ef631 100644 --- a/src/gromacs/analysisdata/tests/arraydata.cpp +++ b/src/gromacs/analysisdata/tests/arraydata.cpp @@ -69,7 +69,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 diff --git a/src/gromacs/analysisdata/tests/average.cpp b/src/gromacs/analysisdata/tests/average.cpp index f54d6badf8..7ee8b775dc 100644 --- a/src/gromacs/analysisdata/tests/average.cpp +++ b/src/gromacs/analysisdata/tests/average.cpp @@ -65,7 +65,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 @@ -92,7 +92,7 @@ class MultipointInputData public: static const AnalysisDataTestInput &get() { -#ifndef INTEL_STATIC_ANON_NAMESPACE_BUG +#ifndef STATIC_ANON_NAMESPACE_BUG static MultipointInputData singleton; return singleton.data_; #else @@ -126,7 +126,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 diff --git a/src/gromacs/analysisdata/tests/datatest.h b/src/gromacs/analysisdata/tests/datatest.h index 5b9c210a58..09f4127470 100644 --- a/src/gromacs/analysisdata/tests/datatest.h +++ b/src/gromacs/analysisdata/tests/datatest.h @@ -55,8 +55,8 @@ #include "testutils/refdata.h" // currently the bug manifests itself only in AbstractAnalysisData testing -#if (defined __ICL && __ICL >= 1400) || (defined __ICC & __ICC >= 1400) -#define INTEL_STATIC_ANON_NAMESPACE_BUG //see #1558 for details +#if (defined __ICL && __ICL >= 1400) || (defined __ICC && __ICC >= 1400) || (defined __PATHSCALE__) +#define STATIC_ANON_NAMESPACE_BUG //see #1558 for details #endif namespace gmx diff --git a/src/gromacs/analysisdata/tests/histogram.cpp b/src/gromacs/analysisdata/tests/histogram.cpp index 18ec9ce1b9..8a4cdacd1d 100644 --- a/src/gromacs/analysisdata/tests/histogram.cpp +++ b/src/gromacs/analysisdata/tests/histogram.cpp @@ -157,7 +157,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 @@ -243,7 +243,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 @@ -280,7 +280,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 @@ -452,7 +452,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 diff --git a/src/gromacs/analysisdata/tests/lifetime.cpp b/src/gromacs/analysisdata/tests/lifetime.cpp index 1ea1551fd5..52a29833af 100644 --- a/src/gromacs/analysisdata/tests/lifetime.cpp +++ b/src/gromacs/analysisdata/tests/lifetime.cpp @@ -64,7 +64,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 @@ -91,7 +91,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 -- 2.22.0