biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable static anon namespace workaround on pathscale
[alexxy/gromacs.git]
/
src
/
gromacs
/
analysisdata
/
tests
/
histogram.cpp
diff --git
a/src/gromacs/analysisdata/tests/histogram.cpp
b/src/gromacs/analysisdata/tests/histogram.cpp
index 18ec9ce1b9315c2ab9a1cf8aafa6219febd5a33f..8a4cdacd1dfeee5937bda5630b8dcaaeeae8209b 100644
(file)
--- 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()
{
public:
static const AnalysisDataTestInput &get()
{
-#ifndef
INTEL_
STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
static SimpleInputData singleton;
return singleton.data_;
#else
static SimpleInputData singleton;
return singleton.data_;
#else
@@
-243,7
+243,7
@@
class WeightedSimpleInputData
public:
static const AnalysisDataTestInput &get()
{
public:
static const AnalysisDataTestInput &get()
{
-#ifndef
INTEL_
STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
static WeightedSimpleInputData singleton;
return singleton.data_;
#else
static WeightedSimpleInputData singleton;
return singleton.data_;
#else
@@
-280,7
+280,7
@@
class WeightedDataSetInputData
public:
static const AnalysisDataTestInput &get()
{
public:
static const AnalysisDataTestInput &get()
{
-#ifndef
INTEL_
STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
static WeightedDataSetInputData singleton;
return singleton.data_;
#else
static WeightedDataSetInputData singleton;
return singleton.data_;
#else
@@
-452,7
+452,7
@@
class AverageInputData
public:
static const AnalysisDataTestInput &get()
{
public:
static const AnalysisDataTestInput &get()
{
-#ifndef
INTEL_
STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
static AverageInputData singleton;
return singleton.data_;
#else
static AverageInputData singleton;
return singleton.data_;
#else