Updates will be applied on October 27th between 12pm - 12:45pm EDT (UTC-0400). Gitlab may be slow during the maintenance window.

Commit 7eb8d74a authored by miller86's avatar miller86
Browse files

moving a file-scope static variable into a function

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12410 18c085ea-50e0-402c-830e-de6fd14e8384
parent 14cbcf03
...@@ -6745,15 +6745,15 @@ avtDatabaseMetaData::Add(avtSubsetsMetaData *smd) ...@@ -6745,15 +6745,15 @@ avtDatabaseMetaData::Add(avtSubsetsMetaData *smd)
if (VariableNamesEqual(Get ## VT(i).name, varname)) \ if (VariableNamesEqual(Get ## VT(i).name, varname)) \
return Get ## VT(i).matRestricted return Get ## VT(i).matRestricted
static intVector dummy_matnos;
const intVector& avtDatabaseMetaData::GetRestrictedMatnos(const std::string& varname) const const intVector& avtDatabaseMetaData::GetRestrictedMatnos(const std::string& varname) const
{ {
int i; int i;
static intVector dummy;
CHECK_VAR_TYPE(Scalars); CHECK_VAR_TYPE(Scalars);
CHECK_VAR_TYPE(Vectors); CHECK_VAR_TYPE(Vectors);
CHECK_VAR_TYPE(Tensors); CHECK_VAR_TYPE(Tensors);
CHECK_VAR_TYPE(Arrays); CHECK_VAR_TYPE(Arrays);
CHECK_VAR_TYPE(Labels); CHECK_VAR_TYPE(Labels);
return dummy_matnos; return dummy;
} }
...@@ -3630,14 +3630,14 @@ Definition: ...@@ -3630,14 +3630,14 @@ Definition:
if (VariableNamesEqual(Get ## VT(i).name, varname)) \ if (VariableNamesEqual(Get ## VT(i).name, varname)) \
return Get ## VT(i).matRestricted return Get ## VT(i).matRestricted
static intVector dummy_matnos;
const intVector& avtDatabaseMetaData::GetRestrictedMatnos(const std::string& varname) const const intVector& avtDatabaseMetaData::GetRestrictedMatnos(const std::string& varname) const
{ {
int i; int i;
static intVector dummy;
CHECK_VAR_TYPE(Scalars); CHECK_VAR_TYPE(Scalars);
CHECK_VAR_TYPE(Vectors); CHECK_VAR_TYPE(Vectors);
CHECK_VAR_TYPE(Tensors); CHECK_VAR_TYPE(Tensors);
CHECK_VAR_TYPE(Arrays); CHECK_VAR_TYPE(Arrays);
CHECK_VAR_TYPE(Labels); CHECK_VAR_TYPE(Labels);
return dummy_matnos; return dummy;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment