From da807adc9997beff52fc99e1174289ad8d201653 Mon Sep 17 00:00:00 2001 From: g Date: Tue, 28 Mar 2017 11:52:49 -0700 Subject: [PATCH] Added condition to check if _NOEXCEPT is defined --- include/yaml-cpp/exceptions.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/yaml-cpp/exceptions.h b/include/yaml-cpp/exceptions.h index a2dccaf..7bfd0a1 100644 --- a/include/yaml-cpp/exceptions.h +++ b/include/yaml-cpp/exceptions.h @@ -8,12 +8,16 @@ #endif #ifndef NOEXCEPT -#ifndef _MSC_VER -#define NOEXCEPT noexcept -#else +#ifdef _MSC_VER +#ifdef _NOEXCEPT #define NOEXCEPT _NOEXCEPT -#endif -#endif +#else +#define NOEXCEPT +#endif // ifdef _NOEXCEPT +#else +#define NOEXCEPT noexcept +#endif // ifdef _MSC_VER +#endif // ifdef NOEXCEPT #include "yaml-cpp/mark.h" #include "yaml-cpp/traits.h"