From 714dba3af3c39c4381eb4349b08bb2bd03762022 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 28 May 2018 10:35:38 +0200 Subject: Fixed build with extra warnings. --- CMakeLists.txt | 2 +- common/typeindex.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f322faa..4654cf9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,7 +123,7 @@ endfunction() set(CMAKE_AUTOMOC ON) if (${CATCH_ERRORS}) - add_definitions("-Werror -Wall -Weverything -Wno-unused-function -Wno-cast-align -Wno-used-but-marked-unused -Wno-shadow -Wno-weak-vtables -Wno-global-constructors -Wno-deprecated -Wno-weak-template-vtables -Wno-exit-time-destructors -Wno-covered-switch-default -Wno-shorten-64-to-32 -Wno-documentation -Wno-old-style-cast -Wno-extra-semi -Wno-unused-parameter -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-missing-noreturn -Wno-missing-prototypes -Wno-documentation-unknown-command -Wno-sign-conversion -Wno-gnu-zero-variadic-macro-arguments -Wno-disabled-macro-expansion -Wno-vla-extension -Wno-vla -Wno-undefined-func-template -Wno-#warnings -Wno-unused-template -Wno-inconsistent-missing-destructor-override -Wno-zero-as-null-pointer-constant -Wno-unused-lambda-capture") + add_definitions("-Werror -Wall -Weverything -Wno-unused-function -Wno-cast-align -Wno-used-but-marked-unused -Wno-shadow -Wno-weak-vtables -Wno-global-constructors -Wno-deprecated -Wno-weak-template-vtables -Wno-exit-time-destructors -Wno-covered-switch-default -Wno-shorten-64-to-32 -Wno-documentation -Wno-old-style-cast -Wno-extra-semi -Wno-unused-parameter -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-missing-noreturn -Wno-missing-prototypes -Wno-documentation-unknown-command -Wno-sign-conversion -Wno-gnu-zero-variadic-macro-arguments -Wno-disabled-macro-expansion -Wno-vla-extension -Wno-vla -Wno-undefined-func-template -Wno-#warnings -Wno-unused-template -Wno-inconsistent-missing-destructor-override -Wno-zero-as-null-pointer-constant -Wno-unused-lambda-capture -Wno-switch-enum") endif() set(CMAKE_CXX_STANDARD 14) diff --git a/common/typeindex.cpp b/common/typeindex.cpp index 589b770..a111134 100644 --- a/common/typeindex.cpp +++ b/common/typeindex.cpp @@ -60,7 +60,7 @@ static QByteArray toSortableByteArrayImpl(const QDateTime &date) if (!date.isValid()) { return QByteArray::number(std::numeric_limits::max()); } - static unsigned int uint_num_digits = std::log10(std::numeric_limits::max()) + 1; + static unsigned int uint_num_digits = (unsigned int)std::log10(std::numeric_limits::max()) + 1; return QByteArray::number(std::numeric_limits::max() - date.toTime_t()).rightJustified(uint_num_digits, '0'); } -- cgit v1.2.3