X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fscenegraph.cpp;h=c1730c333ed31b7134c26733202bbc38b990a5c6;hb=b9700194fb09af0add30e9d762848b9ea4e5eb56;hp=1f885cff9e16d73c7dd6b7945abb53a2e5be87a1;hpb=e4287c28bb2dafedc81c66e63951d947cfbeb225;p=xonotic%2Fnetradiant.git diff --git a/radiant/scenegraph.cpp b/radiant/scenegraph.cpp index 1f885cff..c1730c33 100644 --- a/radiant/scenegraph.cpp +++ b/radiant/scenegraph.cpp @@ -33,17 +33,6 @@ #include "instancelib.h" #include "treemodel.h" -class StringEqualPredicate -{ -const char* m_string; -public: -StringEqualPredicate( const char* string ) : m_string( string ){ -} -bool operator()( const char* other ) const { - return string_equal( m_string, other ); -} -}; - template class TypeIdMap { @@ -56,7 +45,9 @@ public: TypeIdMap() : m_typeNamesEnd( m_typeNames ){ } TypeId getTypeId( const char* name ){ - TypeName* i = std::find_if( m_typeNames, m_typeNamesEnd, StringEqualPredicate( name ) ); + TypeName *i = std::find_if(m_typeNames, m_typeNamesEnd, [&](const char *other) { + return string_equal(name, other); + }); if ( i == m_typeNamesEnd ) { ASSERT_MESSAGE( m_typeNamesEnd != m_typeNames + SIZE, "reached maximum number of type names supported (" << Unsigned( SIZE ) << ")" ); *m_typeNamesEnd++ = name;