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
/
analysisdata.cpp
diff --git
a/src/gromacs/analysisdata/tests/analysisdata.cpp
b/src/gromacs/analysisdata/tests/analysisdata.cpp
index 7cdd8baffa67df33e607a06d0a96e06c14e94cd3..c1f94697bac778e339a42512283d33c70c010963 100644
(file)
--- a/
src/gromacs/analysisdata/tests/analysisdata.cpp
+++ b/
src/gromacs/analysisdata/tests/analysisdata.cpp
@@
-154,7
+154,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
@@
-181,7
+181,7
@@
class DataSetsInputData
public:
static const AnalysisDataTestInput &get()
{
public:
static const AnalysisDataTestInput &get()
{
-#ifndef
INTEL_
STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
static DataSetsInputData singleton;
return singleton.data_;
#else
static DataSetsInputData singleton;
return singleton.data_;
#else
@@
-216,7
+216,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
@@
-253,7
+253,7
@@
class MultipointDataSetsInputData
public:
static const AnalysisDataTestInput &get()
{
public:
static const AnalysisDataTestInput &get()
{
-#ifndef
INTEL_
STATIC_ANON_NAMESPACE_BUG
+#ifndef STATIC_ANON_NAMESPACE_BUG
static MultipointDataSetsInputData singleton;
return singleton.data_;
#else
static MultipointDataSetsInputData singleton;
return singleton.data_;
#else