diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/boost/config/no_tr1/utility.hpp --- a/epoc32/include/stdapis/boost/config/no_tr1/utility.hpp Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/stdapis/boost/config/no_tr1/utility.hpp Wed Mar 31 12:33:34 2010 +0100 @@ -1,19 +1,28 @@ -// Boost utility.hpp header file -------------------------------------------// +// (C) Copyright John Maddock 2005. +// Use, modification and distribution are subject to the +// Boost Software License, Version 1.0. (See accompanying file +// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +// +// The aim of this header is just to include but to do +// so in a way that does not result in recursive inclusion of +// the Boost TR1 components if boost/tr1/tr1/utility is in the +// include search path. We have to do this to avoid circular +// dependencies: +// -// Copyright 1999-2003 Aleksey Gurtovoy. Use, modification, and distribution are -// subject to the Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or a copy at .) +#ifndef BOOST_CONFIG_UTILITY +# define BOOST_CONFIG_UTILITY -// See for the library's home page. +# ifndef BOOST_TR1_NO_RECURSION +# define BOOST_TR1_NO_RECURSION +# define BOOST_CONFIG_NO_UTILITY_RECURSION +# endif -#ifndef BOOST_UTILITY_HPP -#define BOOST_UTILITY_HPP +# include -#include -#include -#include -#include -#include -#include +# ifdef BOOST_CONFIG_NO_UTILITY_RECURSION +# undef BOOST_TR1_NO_RECURSION +# undef BOOST_CONFIG_NO_UTILITY_RECURSION +# endif -#endif // BOOST_UTILITY_HPP +#endif