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
Merge release-5-0 into master
[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 cbfc91cd2aa5e8523104ade246b20d579889b1dd..cdeabbb77d0fa160f0761b1df16d4ba0e9b563b6 100644
(file)
--- a/
src/gromacs/analysisdata/tests/average.cpp
+++ b/
src/gromacs/analysisdata/tests/average.cpp
@@
-68,7
+68,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
@@
-95,7
+95,7
@@
class MultipointInputData
public:
static const AnalysisDataTestInput &get()
{
public:
static const AnalysisDataTestInput &get()
{
-#ifndef
INTEL_
STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
static MultipointInputData singleton;
return singleton.data_;
#else
static MultipointInputData singleton;
return singleton.data_;
#else
@@
-129,7
+129,7
@@
class MultiDataSetInputData
public:
static const AnalysisDataTestInput &get()
{
public:
static const AnalysisDataTestInput &get()
{
-#ifndef
INTEL_
STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
static MultiDataSetInputData singleton;
return singleton.data_;
#else
static MultiDataSetInputData singleton;
return singleton.data_;
#else