Commit c1a4a201 authored by Floris Berendsen's avatar Floris Berendsen
Browse files

BUG: added std::sting, since equality check doesn't work for 2 char*

parent 57374453
...@@ -48,7 +48,7 @@ template<typename FirstInterface, typename ... RestInterfaces> ...@@ -48,7 +48,7 @@ template<typename FirstInterface, typename ... RestInterfaces>
ComponentBase::interfaceStatus Accepting<FirstInterface, RestInterfaces... >::ConnectFromImpl(const char * interfacename, ComponentBase* other) ComponentBase::interfaceStatus Accepting<FirstInterface, RestInterfaces... >::ConnectFromImpl(const char * interfacename, ComponentBase* other)
{ {
// does our component have an accepting interface called interfacename? // does our component have an accepting interface called interfacename?
if (InterfaceName<InterfaceAcceptor<FirstInterface>>::Get() == interfacename) if (InterfaceName<InterfaceAcceptor<FirstInterface>>::Get() == std::string(interfacename))
{ {
// 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;
...@@ -82,7 +82,7 @@ int Accepting<FirstInterface, RestInterfaces... >::ConnectFromImpl(ComponentBase ...@@ -82,7 +82,7 @@ int Accepting<FirstInterface, RestInterfaces... >::ConnectFromImpl(ComponentBase
template<typename FirstInterface, typename ... RestInterfaces> template<typename FirstInterface, typename ... RestInterfaces>
bool Accepting<FirstInterface, RestInterfaces... >::HasInterface(const char* interfacename) bool Accepting<FirstInterface, RestInterfaces... >::HasInterface(const char* interfacename)
{ {
if (InterfaceName<InterfaceAcceptor<FirstInterface>>::Get() == interfacename) if (InterfaceName<InterfaceAcceptor<FirstInterface>>::Get() == std::string(interfacename))
{ {
return true; return true;
} }
...@@ -92,7 +92,7 @@ bool Accepting<FirstInterface, RestInterfaces... >::HasInterface(const char* int ...@@ -92,7 +92,7 @@ bool Accepting<FirstInterface, RestInterfaces... >::HasInterface(const char* int
template<typename FirstInterface, typename ... RestInterfaces> template<typename FirstInterface, typename ... RestInterfaces>
bool Providing<FirstInterface, RestInterfaces... >::HasInterface(const char* interfacename) bool Providing<FirstInterface, RestInterfaces... >::HasInterface(const char* interfacename)
{ {
if (InterfaceName<FirstInterface>::Get() == interfacename) if (InterfaceName<FirstInterface>::Get() == std::string( interfacename))
{ {
return true; return true;
} }
......
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