From ceea7f7be925e02f13b81a41c29b1b2228c30ccb Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Sun, 17 Mar 2013 22:10:08 -0500 Subject: [PATCH] adds additional C++11 library blacklist defines --- websocketpp/common/chrono.hpp | 2 +- websocketpp/common/functional.hpp | 2 +- websocketpp/common/memory.hpp | 2 +- websocketpp/common/random.hpp | 2 +- websocketpp/common/system_error.hpp | 2 +- websocketpp/common/thread.hpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/websocketpp/common/chrono.hpp b/websocketpp/common/chrono.hpp index c93ae9f16b..dbd1d4ed25 100644 --- a/websocketpp/common/chrono.hpp +++ b/websocketpp/common/chrono.hpp @@ -28,7 +28,7 @@ #ifndef WEBSOCKETPP_COMMON_CHRONO_HPP #define WEBSOCKETPP_COMMON_CHRONO_HPP -#ifdef _WEBSOCKETPP_CPP11_STL_ +#if defined _WEBSOCKETPP_CPP11_STL_ && !defined _WEBSOCKETPP_NO_CPP11_CHRONO_ #ifndef _WEBSOCKETPP_CPP11_CHRONO_ #define _WEBSOCKETPP_CPP11_CHRONO_ #endif diff --git a/websocketpp/common/functional.hpp b/websocketpp/common/functional.hpp index 053c801d36..71fa632d89 100644 --- a/websocketpp/common/functional.hpp +++ b/websocketpp/common/functional.hpp @@ -28,7 +28,7 @@ #ifndef WEBSOCKETPP_COMMON_FUNCTIONAL_HPP #define WEBSOCKETPP_COMMON_FUNCTIONAL_HPP -#ifdef _WEBSOCKETPP_CPP11_STL_ +#if defined _WEBSOCKETPP_CPP11_STL_ && !defined _WEBSOCKETPP_NO_CPP11_FUNCTIONAL_ #ifndef _WEBSOCKETPP_CPP11_FUNCTIONAL_ #define _WEBSOCKETPP_CPP11_FUNCTIONAL_ #endif diff --git a/websocketpp/common/memory.hpp b/websocketpp/common/memory.hpp index ca86160b52..97c0a07151 100644 --- a/websocketpp/common/memory.hpp +++ b/websocketpp/common/memory.hpp @@ -28,7 +28,7 @@ #ifndef WEBSOCKETPP_COMMON_MEMORY_HPP #define WEBSOCKETPP_COMMON_MEMORY_HPP -#ifdef _WEBSOCKETPP_CPP11_STL_ +#if defined _WEBSOCKETPP_CPP11_STL_ && !defined _WEBSOCKETPP_NO_CPP11_MEMORY_ #ifndef _WEBSOCKETPP_CPP11_MEMORY_ #define _WEBSOCKETPP_CPP11_MEMORY_ #endif diff --git a/websocketpp/common/random.hpp b/websocketpp/common/random.hpp index e3b9732474..b3162f37fe 100644 --- a/websocketpp/common/random.hpp +++ b/websocketpp/common/random.hpp @@ -28,7 +28,7 @@ #ifndef WEBSOCKETPP_COMMON_RANDOM_DEVICE_HPP #define WEBSOCKETPP_COMMON_RANDOM_DEVICE_HPP -#ifdef _WEBSOCKETPP_CPP11_STL_ +#if defined _WEBSOCKETPP_CPP11_STL_ && !defined _WEBSOCKETPP_NO_CPP11_RANDOM_DEVICE_ #ifndef _WEBSOCKETPP_CPP11_RANDOM_DEVICE_ #define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_ #endif diff --git a/websocketpp/common/system_error.hpp b/websocketpp/common/system_error.hpp index 7f36e84cc6..f206318f5e 100644 --- a/websocketpp/common/system_error.hpp +++ b/websocketpp/common/system_error.hpp @@ -28,7 +28,7 @@ #ifndef WEBSOCKETPP_COMMON_SYSTEM_ERROR_HPP #define WEBSOCKETPP_COMMON_SYSTEM_ERROR_HPP -#ifdef _WEBSOCKETPP_CPP11_STL_ +#if defined _WEBSOCKETPP_CPP11_STL_ && !defined _WEBSOCKETPP_NO_CPP11_SYSTEM_ERROR_ #ifndef _WEBSOCKETPP_CPP11_SYSTEM_ERROR_ #define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_ #endif diff --git a/websocketpp/common/thread.hpp b/websocketpp/common/thread.hpp index 8c5037a14a..a82e7bacd8 100644 --- a/websocketpp/common/thread.hpp +++ b/websocketpp/common/thread.hpp @@ -28,7 +28,7 @@ #ifndef WEBSOCKETPP_COMMON_THREAD_HPP #define WEBSOCKETPP_COMMON_THREAD_HPP -#ifdef _WEBSOCKETPP_CPP11_STL_ +#if defined _WEBSOCKETPP_CPP11_STL_ && !defined _WEBSOCKETPP_NO_CPP11_THREAD_ #ifndef _WEBSOCKETPP_CPP11_THREAD_ #define _WEBSOCKETPP_CPP11_THREAD_ #endif