Commit 84997a37 authored by Kasper Marstal's avatar Kasper Marstal
Browse files

GIT: Fix committed conflict

parent 29a41ad7
...@@ -82,13 +82,8 @@ int ...@@ -82,13 +82,8 @@ int
Accepting< FirstInterface, RestInterfaces ... >::ConnectFromImpl( ComponentBase * other, Accepting< FirstInterface, RestInterfaces ... >::ConnectFromImpl( ComponentBase * other,
const ComponentBase::InterfaceCriteriaType interfaceCriteria ) const ComponentBase::InterfaceCriteriaType interfaceCriteria )
{ {
<<<<<<< HEAD
// Does our component have an accepting interface sufficing the right criteria (e.g interfaceName)? // Does our component have an accepting interface sufficing the right criteria (e.g interfaceName)?
if( Count< FirstInterface >::MeetsCriteria( interfaceCriteria ) == 1 ) // We use the FirstInterface only (of each recursion level), thus the count can be 0 or 1 if( Count< FirstInterface >::MeetsCriteria( interfaceCriteria ) == 1 ) // We use the FirstInterface only (of each recursion level), thus the count can be 0 or 1
=======
// does our component have an accepting interface called interfacename?
if( InterfaceName< InterfaceAcceptor< FirstInterface > >::Get() == std::string( interfacename ) )
>>>>>>> elastix-152-build-commandline-program-in-superbuild
{ {
// cast always succeeds since we know via the template arguments of the component which InterfaceAcceptors its base classes are. // cast always succeeds since we know via the template arguments of the component which InterfaceAcceptors its base classes are.
InterfaceAcceptor< FirstInterface > * acceptIF = this; InterfaceAcceptor< FirstInterface > * acceptIF = this;
......
Supports Markdown
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