Commit a51432a8 authored by Daniel Vrátil's avatar Daniel Vrátil
Browse files

Don't assume std::array iterator is a pointer

The standard says iterator type is implementation-defined and while
libc++ and libstdc++ implement std::array iterators as pointers the
MSVC STL does not, so the build fails there.
parent 54cfa5d7
Pipeline #39246 passed with stage
in 15 minutes and 13 seconds
......@@ -204,7 +204,10 @@ void Kleo::CryptoConfigModule::init(Layout layout)
}
}
QStringList Kleo::CryptoConfigModule::sortConfigEntries(const QString *orderBegin, const QString *orderEnd, const QStringList &entries)
namespace
{
template<typename Iterator>
QStringList sortConfigEntries(const Iterator orderBegin, const Iterator orderEnd, const QStringList &entries)
{
// components sorting algorithm:
// 1. components with predefined order (provided via orderBegin / orderEnd)
......@@ -224,6 +227,7 @@ QStringList Kleo::CryptoConfigModule::sortConfigEntries(const QString *orderBegi
result.append(others);
return result;
}
} // namespace
QStringList Kleo::CryptoConfigModule::sortComponentList(const QStringList &components)
{
......
......@@ -54,7 +54,6 @@ Q_SIGNALS:
private:
void init(Layout layout);
static QStringList sortConfigEntries(const QString *orderBegin, const QString *orderEnd, const QStringList &entries);
static QStringList sortComponentList(const QStringList &components);
public:
......
Markdown is supported
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