From 1e0770fcad88bcaa3e3f7a65a31b7ef219c6ea25 Mon Sep 17 00:00:00 2001 From: armedturret Date: Sat, 22 Dec 2018 17:40:42 -0500 Subject: [PATCH] Fixed compiler macros of MSVC 2017 --- DAEValidator/CMakeLists.txt | 2 +- DAEValidator/library/src/ArgumentParser.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DAEValidator/CMakeLists.txt b/DAEValidator/CMakeLists.txt index 03ad540ff..f7d05cfbe 100644 --- a/DAEValidator/CMakeLists.txt +++ b/DAEValidator/CMakeLists.txt @@ -98,7 +98,7 @@ if (WIN32) # C4710: 'function' : function not inlined # C4711: function 'function' selected for inline expansion # C4820: 'bytes' bytes padding added after construct 'member_name' - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /WX /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820") else () set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror") endif () diff --git a/DAEValidator/library/src/ArgumentParser.cpp b/DAEValidator/library/src/ArgumentParser.cpp index 897e4dcfe..98a69ff10 100644 --- a/DAEValidator/library/src/ArgumentParser.cpp +++ b/DAEValidator/library/src/ArgumentParser.cpp @@ -6,10 +6,10 @@ using namespace std; -#ifdef _MSC_VER -#define NOEXCEPT _NOEXCEPT -#else +#ifndef _NOEXCEPT #define NOEXCEPT noexcept +#else +#define NOEXCEPT _NOEXCEPT #endif namespace opencollada