From 60ad3d9c2b83d83f1e4cc57d59480205712ca594 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 11 May 2018 05:28:50 +0200 Subject: [PATCH] Fixed trait so "compare" is properly called --- src/blackmisc/propertyindex.h | 2 +- src/blackmisc/typetraits.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h index ce019c8ba..afd82d64f 100644 --- a/src/blackmisc/propertyindex.h +++ b/src/blackmisc/propertyindex.h @@ -241,7 +241,7 @@ namespace BlackMisc return [index = *this](const auto & a, const auto & b) { using T = std::decay_t; - return Private::compareByProperty(a, b, index, THasCompareByPropertyIndex(), THasPropertyByIndex()); + return Private::compareByProperty(a, b, index, THasComparePropertyByIndex(), THasPropertyByIndex()); }; } diff --git a/src/blackmisc/typetraits.h b/src/blackmisc/typetraits.h index 5f6d548f1..444eb836d 100644 --- a/src/blackmisc/typetraits.h +++ b/src/blackmisc/typetraits.h @@ -164,10 +164,10 @@ namespace BlackMisc * and i is an instance of CPropertyIndex. */ template > - struct THasCompareByPropertyIndex : public std::false_type {}; + struct THasComparePropertyByIndex : public std::false_type {}; //! \cond template - struct THasCompareByPropertyIndex().compareByPropertyIndex(std::declval(), std::declval()))>> : public std::true_type {}; + struct THasComparePropertyByIndex().comparePropertyByIndex(std::declval(), std::declval()))>> : public std::true_type {}; //! \endcond /*!