From 174302a90771bb6571454ee96b6f6bc9af42cf23 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 1 Apr 2016 12:50:02 +0400 Subject: [PATCH] Ignoring 4099 warning in VS project linking. Added header to precompiled header and std:: math usage. --- Telegram/SourceFiles/stdafx.h | 2 ++ Telegram/SourceFiles/types.h | 2 ++ Telegram/Telegram.vcxproj | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h index 12885f468..e87a6c5b0 100644 --- a/Telegram/SourceFiles/stdafx.h +++ b/Telegram/SourceFiles/stdafx.h @@ -25,6 +25,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #ifdef __cplusplus +#include + #include #include #include diff --git a/Telegram/SourceFiles/types.h b/Telegram/SourceFiles/types.h index bbf44693d..babef3cb0 100644 --- a/Telegram/SourceFiles/types.h +++ b/Telegram/SourceFiles/types.h @@ -650,6 +650,8 @@ MimeType mimeTypeForName(const QString &mime); MimeType mimeTypeForFile(const QFileInfo &file); MimeType mimeTypeForData(const QByteArray &data); +#include + inline int rowscount(int fullCount, int countPerRow) { return (fullCount + countPerRow - 1) / countPerRow; } diff --git a/Telegram/Telegram.vcxproj b/Telegram/Telegram.vcxproj index 8b18f8ada..cdde8b981 100644 --- a/Telegram/Telegram.vcxproj +++ b/Telegram/Telegram.vcxproj @@ -123,6 +123,7 @@ true + /ignore:4099 %(AdditionalOptions) @@ -154,6 +155,7 @@ true + /ignore:4099 %(AdditionalOptions)