Commit 4a6f3bbc authored by hrchilds's avatar hrchilds

Fix problem with test suite I introduced with CMFE.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21503 18c085ea-50e0-402c-830e-de6fd14e8384
parent e2fa2829
......@@ -127,12 +127,25 @@ avtCMFEExpression::~avtCMFEExpression()
// Programmer: Hank Childs
// Creation: January 5, 2006
//
// Modifications:
//
// Hank Childs, Sun Aug 4 11:35:08 PDT 2013
// Tell the base class infrastructure about secondary variables.
//
// ****************************************************************************
void
avtCMFEExpression::AddInputVariableName(const char *vname)
{
avtExpressionFilter::AddInputVariableName(vname);
if (varnames.size() > 0)
{
// Every time we get a new variable, let's declare the previous
// one as secondary. This particularly works well, since the
// module that calls AddInputVariableName is also making the variable
// that gets passed in the active variable automatically.
AddSecondaryVariable(varnames[varnames.size()-1].c_str());
}
varnames.push_back(vname);
}
......
......@@ -382,13 +382,18 @@ avtDatasetToDatasetFilter::SetActiveVariable(const char *varname)
// Programmer: Hank Childs <Added Header>
// Creation: September 22, 2003 <Header Creation Date>
//
// Modifications:
//
// Hank Childs, Sun Aug 4 11:31:50 PDT 2013
// Add check to make sure activeVariable is not NULL.
//
// ****************************************************************************
void
avtDatasetToDatasetFilter::AddSecondaryVariable(const char *var)
{
// Are we already asking for this in the activeVariable?
if (strcmp(activeVariable, var) == 0)
if (activeVariable != NULL && strcmp(activeVariable, var) == 0)
return;
// Search through the existing secondary variables and see if it's
......
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