From bc7c88c511f76f9fa22051118188d0860094df4c Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 19 Nov 2017 20:31:58 +0400 Subject: [PATCH] Fix build in Xcode / GCC. --- Telegram/SourceFiles/info/profile/info_profile_members.h | 2 +- Telegram/SourceFiles/platform/mac/main_window_mac.mm | 2 ++ Telegram/SourceFiles/stdafx.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.h b/Telegram/SourceFiles/info/profile/info_profile_members.h index 8da81f38c..0683b6f19 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members.h +++ b/Telegram/SourceFiles/info/profile/info_profile_members.h @@ -123,7 +123,7 @@ private: void updateHeaderControlsGeometry(int newWidth); void updateSearchEnabledByContent(); - Wrap _wrap; + //Wrap _wrap; not_null _controller; not_null _peer; std::unique_ptr _listController; diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index a54e52895..3cfc0bc1b 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -337,7 +337,9 @@ MainWindow::Private::~Private() { MainWindow::MainWindow() : _private(std::make_unique(this)) { +#ifndef OS_MAC_OLD auto forceOpenGL = std::make_unique(this); +#endif // !OS_MAC_OLD trayImg = st::macTrayIcon.instance(QColor(0, 0, 0, 180), dbisOne); trayImgSel = st::macTrayIcon.instance(QColor(255, 255, 255), dbisOne); diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h index 9e4500240..15c3b6f0e 100644 --- a/Telegram/SourceFiles/stdafx.h +++ b/Telegram/SourceFiles/stdafx.h @@ -47,6 +47,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #define OS_MAC_OLD +#define RANGES_CXX_THREAD_LOCAL 0 #endif // QT_VERSION < 5.5.0 #ifdef OS_MAC_STORE