From 908b945f508571c8a7864e5e39210a72fde94584 Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Fri, 16 May 2014 14:57:33 +0200 Subject: [PATCH] BoostWorkaround/shared_array and shared_ptr: fix checks for whether the boost originals are included already. Fixes #277 --- code/BoostWorkaround/boost/shared_array.hpp | 2 +- code/BoostWorkaround/boost/shared_ptr.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/BoostWorkaround/boost/shared_array.hpp b/code/BoostWorkaround/boost/shared_array.hpp index 47bb4cf6f..2d068d556 100644 --- a/code/BoostWorkaround/boost/shared_array.hpp +++ b/code/BoostWorkaround/boost/shared_array.hpp @@ -2,7 +2,7 @@ #ifndef INCLUDED_AI_BOOST_SHARED_ARRAY #define INCLUDED_AI_BOOST_SHARED_ARRAY -#ifndef BOOST_SCOPED_ARRAY_HPP_INCLUDED +#ifndef BOOST_SHARED_ARRAY_HPP_INCLUDED // ------------------------------ // Internal stub diff --git a/code/BoostWorkaround/boost/shared_ptr.hpp b/code/BoostWorkaround/boost/shared_ptr.hpp index bb7db3662..590e2ce87 100644 --- a/code/BoostWorkaround/boost/shared_ptr.hpp +++ b/code/BoostWorkaround/boost/shared_ptr.hpp @@ -2,7 +2,7 @@ #ifndef INCLUDED_AI_BOOST_SHARED_PTR #define INCLUDED_AI_BOOST_SHARED_PTR -#ifndef BOOST_SCOPED_PTR_HPP_INCLUDED +#ifndef BOOST_SHARED_PTR_HPP_INCLUDED // ------------------------------ // Internal stub @@ -254,4 +254,4 @@ inline shared_ptr const_pointer_cast( shared_ptr ptr) #else # error "shared_ptr.h was already included" #endif -#endif // INCLUDED_AI_BOOST_SCOPED_PTR +#endif // INCLUDED_AI_BOOST_SHARED_PTR