From 1cb6dcee541486be718172213135f4964dd17549 Mon Sep 17 00:00:00 2001 From: Pavel Perekhozhikh Date: Sun, 28 Jan 2018 01:34:06 +0300 Subject: [PATCH] [Refactoring] set current standart to c++17 and change any logic to std::clamp (if it's possible) --- CMakeLists.txt | 2 +- Telegram/CMakeLists.txt | 4 ++-- Telegram/SourceFiles/apiwrap.cpp | 2 +- Telegram/SourceFiles/boxes/share_box.cpp | 2 +- .../SourceFiles/codegen/style/parsed_file.cpp | 2 +- Telegram/SourceFiles/core/basic_types.h | 19 ------------------- .../history/history_media_types.cpp | 3 ++- .../SourceFiles/media/media_audio_capture.cpp | 2 +- 8 files changed, 9 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27eec807f..5cb05a461 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ else() find_package(OpenSSL REQUIRED) endif() -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 8ec40f3b6..7afbd668b 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -641,10 +641,10 @@ if(NOT WIN32) set_flag_if_supported(Telegram WNCE -Wno-c++1z-extensions) endif() -# Enable C++14 support for msvc (@todo this should be done in cmake - see ver 3.10 or above) +# Enable C++17 support for msvc (@todo this should be done in cmake - see ver 3.10 or above) if(WIN32) target_compile_options(Telegram PRIVATE - /std:c++14 + /std:c++latest /EHsc # Catch C++ exceptions only, extern C functions never throw a C++ exception. ) endif() diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index ed5385d2a..d0bfd8e5a 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -1334,7 +1334,7 @@ void ApiWrap::resolveWebPages() { } } } else { - m = std::min(m, i.key()->pendingTill - t); + m = std::min(m, i.key()->pendingTill - t); } } diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp index 0ef20b020..0c8266016 100644 --- a/Telegram/SourceFiles/boxes/share_box.cpp +++ b/Telegram/SourceFiles/boxes/share_box.cpp @@ -370,7 +370,7 @@ void ShareBox::Inner::repaintChatAtIndex(int index) { auto row = index / _columnCount; auto column = index % _columnCount; - update(rtlrect(_rowsLeft + std::floor(column * _rowWidthReal), row * _rowHeight, _rowWidth, _rowHeight, width())); + update(rtlrect(_rowsLeft + std::floor(column * _rowWidthReal), row * _rowHeight, _rowWidth, _rowHeight, width())); } ShareBox::Inner::Chat *ShareBox::Inner::getChatAtIndex(int index) { diff --git a/Telegram/SourceFiles/codegen/style/parsed_file.cpp b/Telegram/SourceFiles/codegen/style/parsed_file.cpp index 9f129f3af..85f87eb6b 100644 --- a/Telegram/SourceFiles/codegen/style/parsed_file.cpp +++ b/Telegram/SourceFiles/codegen/style/parsed_file.cpp @@ -79,7 +79,7 @@ bool isValidColor(const QString &str) { } uchar toGray(uchar r, uchar g, uchar b) { - return std::max(std::min(int(0.21 * r + 0.72 * g + 0.07 * b), 255), 0); + return std::clamp(int(0.21 * r + 0.72 * g + 0.07 * b), 0, 255); } uchar readHexUchar(QChar ch) { diff --git a/Telegram/SourceFiles/core/basic_types.h b/Telegram/SourceFiles/core/basic_types.h index d8279bb6c..86cc0364f 100644 --- a/Telegram/SourceFiles/core/basic_types.h +++ b/Telegram/SourceFiles/core/basic_types.h @@ -30,25 +30,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org template using not_null = gsl::not_null; -// Custom libc++ build used for old OS X versions already has this. -#ifndef OS_MAC_OLD - -#if defined COMPILER_CLANG || defined COMPILER_GCC -namespace std { - -template -constexpr std::add_const_t& as_const(T& t) noexcept { - return t; -} - -template -void as_const(const T&&) = delete; - -} // namespace std -#endif // COMPILER_CLANG || COMPILER_GCC - -#endif // OS_MAC_OLD - #include "base/ordered_set.h" #include diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp index 48b13bedf..f0c478d95 100644 --- a/Telegram/SourceFiles/history/history_media_types.cpp +++ b/Telegram/SourceFiles/history/history_media_types.cpp @@ -36,6 +36,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/window_controller.h" #include "styles/style_history.h" #include "calls/calls_instance.h" +#include namespace { @@ -3225,7 +3226,7 @@ QString siteNameFromUrl(const QString &url) { qint32 articleThumbWidth(PhotoData *thumb, qint32 height) { qint32 w = thumb->medium->width(), h = thumb->medium->height(); - return std::max(std::min(height * w / h, height), 1); + return std::clamp(height * w / h, 1, height); } qint32 articleThumbHeight(PhotoData *thumb, qint32 width) { diff --git a/Telegram/SourceFiles/media/media_audio_capture.cpp b/Telegram/SourceFiles/media/media_audio_capture.cpp index f0bcc0254..13006c1f7 100644 --- a/Telegram/SourceFiles/media/media_audio_capture.cpp +++ b/Telegram/SourceFiles/media/media_audio_capture.cpp @@ -571,7 +571,7 @@ void Instance::Inner::processFrame(qint32 offset, qint32 framesize) { if (d->fullSamples < skipSamples + fadeSamples) { qint32 fadedCnt = std::min(samplesCnt, skipSamples + fadeSamples - d->fullSamples); double coef = 1. / fadeSamples, fadedFrom = d->fullSamples - skipSamples; - short *ptr = srcSamplesDataChannel, *zeroEnd = ptr + std::min(samplesCnt, std::max(0, skipSamples - d->fullSamples)), *end = ptr + fadedCnt; + short *ptr = srcSamplesDataChannel, *zeroEnd = ptr + std::clamp(skipSamples - d->fullSamples, 0, samplesCnt), *end = ptr + fadedCnt; for (; ptr != zeroEnd; ++ptr, ++fadedFrom) { *ptr = 0; }