From 4bfec7b3589ac76e0952f062009afd7b3a216803 Mon Sep 17 00:00:00 2001 From: blazeable Date: Mon, 6 Apr 2015 18:58:43 +0200 Subject: [PATCH] Ensure HAVE_CXX11 is checked when defining TINS_IS_CXX11 Include config.h in cxxstd.h --- include/tins/cxxstd.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/tins/cxxstd.h b/include/tins/cxxstd.h index 486f549..fdd1931 100644 --- a/include/tins/cxxstd.h +++ b/include/tins/cxxstd.h @@ -30,6 +30,8 @@ #ifndef TINS_CXXSTD_H #define TINS_CXXSTD_H +#include "config.h" + #include #ifdef __GXX_EXPERIMENTAL_CXX0X__ @@ -38,8 +40,10 @@ #define TINS_CXXSTD_GCC_FIX 0 #endif // __GXX_EXPERIMENTAL_CXX0X__ -#ifndef TINS_IS_CXX11 +#if !defined(TINS_IS_CXX11) && defined(HAVE_CXX11) #define TINS_IS_CXX11 (__cplusplus > 199711L || TINS_CXXSTD_GCC_FIX == 1 || _MSC_VER >= 1800) +#elif !defined(TINS_IS_CXX11) +#define TINS_IS_CXX11 0 #endif // TINS_IS_CXX11 namespace Tins{