1.1 --- a/epoc32/include/stdapis/boost/config/no_tr1/utility.hpp	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/boost/config/no_tr1/utility.hpp	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,19 +1,28 @@
     1.4 -//  Boost utility.hpp header file  -------------------------------------------//
     1.5 +//  (C) Copyright John Maddock 2005.
     1.6 +//  Use, modification and distribution are subject to the
     1.7 +//  Boost Software License, Version 1.0. (See accompanying file
     1.8 +//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
     1.9 +//
    1.10 +// The aim of this header is just to include <utility> but to do
    1.11 +// so in a way that does not result in recursive inclusion of
    1.12 +// the Boost TR1 components if boost/tr1/tr1/utility is in the
    1.13 +// include search path.  We have to do this to avoid circular
    1.14 +// dependencies:
    1.15 +//
    1.16  
    1.17 -//  Copyright 1999-2003 Aleksey Gurtovoy.  Use, modification, and distribution are
    1.18 -//  subject to the Boost Software License, Version 1.0.  (See accompanying file
    1.19 -//  LICENSE_1_0.txt or a copy at <http://www.boost.org/LICENSE_1_0.txt>.)
    1.20 +#ifndef BOOST_CONFIG_UTILITY
    1.21 +#  define BOOST_CONFIG_UTILITY
    1.22  
    1.23 -//  See <http://www.boost.org/libs/utility/> for the library's home page.
    1.24 +#  ifndef BOOST_TR1_NO_RECURSION
    1.25 +#     define BOOST_TR1_NO_RECURSION
    1.26 +#     define BOOST_CONFIG_NO_UTILITY_RECURSION
    1.27 +#  endif
    1.28  
    1.29 -#ifndef BOOST_UTILITY_HPP
    1.30 -#define BOOST_UTILITY_HPP
    1.31 +#  include <utility>
    1.32  
    1.33 -#include <boost/utility/addressof.hpp>
    1.34 -#include <boost/utility/base_from_member.hpp>  
    1.35 -#include <boost/utility/enable_if.hpp>
    1.36 -#include <boost/checked_delete.hpp>
    1.37 -#include <boost/next_prior.hpp>
    1.38 -#include <boost/noncopyable.hpp>
    1.39 +#  ifdef BOOST_CONFIG_NO_UTILITY_RECURSION
    1.40 +#     undef BOOST_TR1_NO_RECURSION
    1.41 +#     undef BOOST_CONFIG_NO_UTILITY_RECURSION
    1.42 +#  endif
    1.43  
    1.44 -#endif  // BOOST_UTILITY_HPP
    1.45 +#endif