Skip to content

Commit af659ff

Browse files
committed
Merge pull request #704 from moritzdannhauer/ElectrodeCoilSetup
Closes #609 and closes #611
2 parents 7e0ab36 + 93012a2 commit af659ff

File tree

11 files changed

+2145
-218
lines changed

11 files changed

+2145
-218
lines changed

src/Core/Algorithms/Base/AlgorithmBase.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,11 @@ bool SCIRun::Core::Algorithms::operator==(const Variable& lhs, const Variable& r
393393
return lhs.name() == rhs.name() && lhs.value() == rhs.value() && lhs.getDatatype() == rhs.getDatatype();
394394
}
395395

396+
bool SCIRun::Core::Algorithms::operator!=(const Variable& lhs, const Variable& rhs)
397+
{
398+
return !(lhs == rhs);
399+
}
400+
396401
std::ostream& SCIRun::Core::Algorithms::operator<<(std::ostream& out, const Variable& var)
397402
{
398403
return out << "[" << var.name() << ", " << var.value() << "]";

src/Core/Algorithms/Base/Variable.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ namespace Algorithms {
8787
};
8888

8989
SCISHARE bool operator==(const Variable& lhs, const Variable& rhs);
90+
SCISHARE bool operator!=(const Variable& lhs, const Variable& rhs);
9091
SCISHARE std::ostream& operator<<(std::ostream& out, const Variable& var);
9192
SCISHARE Variable makeVariable(const std::string& name, const Variable::Value& value);
9293

0 commit comments

Comments
 (0)