From da876f37b29a0e80e2b524e23a41c338660582ad Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Mon, 8 Jan 2018 15:22:04 +0330 Subject: [PATCH] macro guard for checking std::initializer_list --- src/generators/sqlgeneratorbase.cpp | 12 ++++-------- src/wherephrase.h | 4 ++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/generators/sqlgeneratorbase.cpp b/src/generators/sqlgeneratorbase.cpp index d186d4c..4c90641 100644 --- a/src/generators/sqlgeneratorbase.cpp +++ b/src/generators/sqlgeneratorbase.cpp @@ -271,14 +271,10 @@ QString SqlGeneratorBase::fromTableText(const QString &tableName, .arg(rel->localColumn); orderBy = tableName + "." + pk; } else { - qWarning( - QString( - "Relation between table %1 and class %2 (%3) not exists!") - .arg(tableName) - .arg(joinClassName) - .arg(joinTableName.isNull() ? "NULL" : joinTableName) - .toLatin1() - .data()); + qWarning("Relation between table %s and class %s (%s) not exists!", + qPrintable(tableName), + qPrintable(joinClassName), + qPrintable(joinTableName.isNull() ? "NULL" : joinTableName)); joinClassName = QString::null; } } diff --git a/src/wherephrase.h b/src/wherephrase.h index 233e493..4529d0e 100644 --- a/src/wherephrase.h +++ b/src/wherephrase.h @@ -32,7 +32,9 @@ #include "defines.h" #include "types/dbgeography.h" +#if __cplusplus >= 201103L #include +#endif NUT_BEGIN_NAMESPACE @@ -448,11 +450,13 @@ public: return WherePhrase(this, PhraseData::In, vlist); } +#if __cplusplus >= 201103L template WherePhrase in(std::initializer_list list) { return in(QList(list)); } +#endif WherePhrase in(int count, ...) {