From 7294a6d23737628d4d773ae367ca592347f96db7 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE <0xfeedc0de64@gmail.com> Date: Tue, 10 Apr 2018 20:45:36 +0200 Subject: [PATCH] Fixed compilation under MSVC 2017 compiler --- zeiterfassungcorelib/cpp14polyfills.h | 2 +- zeiterfassungguilib/mainwindow.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/zeiterfassungcorelib/cpp14polyfills.h b/zeiterfassungcorelib/cpp14polyfills.h index 2fcbe50..d345a00 100644 --- a/zeiterfassungcorelib/cpp14polyfills.h +++ b/zeiterfassungcorelib/cpp14polyfills.h @@ -1,6 +1,6 @@ #pragma once -#if __cplusplus < 201402L +#if __cplusplus < 201402L && _MSC_VER < 1800 // std includes #include diff --git a/zeiterfassungguilib/mainwindow.h b/zeiterfassungguilib/mainwindow.h index 3b3d57c..d10ba18 100644 --- a/zeiterfassungguilib/mainwindow.h +++ b/zeiterfassungguilib/mainwindow.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include