1.1 --- a/epoc32/include/stdapis/boost/mpl/and.hpp	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/boost/mpl/and.hpp	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,30 +1,56 @@
     1.4 -# /* Copyright (C) 2001
     1.5 -#  * Housemarque Oy
     1.6 -#  * http://www.housemarque.com
     1.7 -#  *
     1.8 -#  * Distributed under the Boost Software License, Version 1.0. (See
     1.9 -#  * accompanying file LICENSE_1_0.txt or copy at
    1.10 -#  * http://www.boost.org/LICENSE_1_0.txt)
    1.11 -#  */
    1.12 -#
    1.13 -# /* Revised by Paul Mensonides (2002) */
    1.14 -#
    1.15 -# /* See http://www.boost.org for most recent version. */
    1.16 -#
    1.17 -# ifndef BOOST_PREPROCESSOR_LOGICAL_AND_HPP
    1.18 -# define BOOST_PREPROCESSOR_LOGICAL_AND_HPP
    1.19 -#
    1.20 -# include <boost/preprocessor/config/config.hpp>
    1.21 -# include <boost/preprocessor/logical/bool.hpp>
    1.22 -# include <boost/preprocessor/logical/bitand.hpp>
    1.23 -#
    1.24 -# /* BOOST_PP_AND */
    1.25 -#
    1.26 -# if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG()
    1.27 -#    define BOOST_PP_AND(p, q) BOOST_PP_BITAND(BOOST_PP_BOOL(p), BOOST_PP_BOOL(q))
    1.28 -# else
    1.29 -#    define BOOST_PP_AND(p, q) BOOST_PP_AND_I(p, q)
    1.30 -#    define BOOST_PP_AND_I(p, q) BOOST_PP_BITAND(BOOST_PP_BOOL(p), BOOST_PP_BOOL(q))
    1.31 -# endif
    1.32 -#
    1.33 -# endif
    1.34 +
    1.35 +#ifndef BOOST_MPL_AND_HPP_INCLUDED
    1.36 +#define BOOST_MPL_AND_HPP_INCLUDED
    1.37 +
    1.38 +// Copyright Aleksey Gurtovoy 2000-2004
    1.39 +//
    1.40 +// Distributed under the Boost Software License, Version 1.0. 
    1.41 +// (See accompanying file LICENSE_1_0.txt or copy at 
    1.42 +// http://www.boost.org/LICENSE_1_0.txt)
    1.43 +//
    1.44 +// See http://www.boost.org/libs/mpl for documentation.
    1.45 +
    1.46 +// $Source: /cvsroot/boost/boost/boost/mpl/and.hpp,v $
    1.47 +// $Date: 2004/09/02 15:40:41 $
    1.48 +// $Revision: 1.5 $
    1.49 +
    1.50 +#include <boost/mpl/aux_/config/use_preprocessed.hpp>
    1.51 +
    1.52 +#if !defined(BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS) \
    1.53 +    && !defined(BOOST_MPL_PREPROCESSING_MODE)
    1.54 +
    1.55 +#   include <boost/mpl/bool.hpp>
    1.56 +#   include <boost/mpl/aux_/nested_type_wknd.hpp>
    1.57 +#   include <boost/mpl/aux_/na_spec.hpp>
    1.58 +#   include <boost/mpl/aux_/lambda_support.hpp>
    1.59 +
    1.60 +// agurt, 19/may/04: workaround a conflict with <iso646.h> header's 
    1.61 +// 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(and)'
    1.62 +// has to be checked in a separate condition, otherwise GCC complains 
    1.63 +// about 'and' being an alternative token
    1.64 +#if defined(_MSC_VER) 
    1.65 +#if defined(and) 
    1.66 +#   pragma push_macro("and")
    1.67 +#   undef and
    1.68 +#   define and(x)
    1.69 +#endif
    1.70 +#endif
    1.71 +
    1.72 +#   define BOOST_MPL_PREPROCESSED_HEADER and.hpp
    1.73 +#   include <boost/mpl/aux_/include_preprocessed.hpp>
    1.74 +
    1.75 +#if defined(_MSC_VER)
    1.76 +#if defined(and) 
    1.77 +#   pragma pop_macro("and")
    1.78 +#endif
    1.79 +#endif
    1.80 +
    1.81 +#else
    1.82 +
    1.83 +#   define AUX778076_OP_NAME and_
    1.84 +#   define AUX778076_OP_VALUE1 false
    1.85 +#   define AUX778076_OP_VALUE2 true
    1.86 +#   include <boost/mpl/aux_/logical_op.hpp>
    1.87 +
    1.88 +#endif // BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
    1.89 +#endif // BOOST_MPL_AND_HPP_INCLUDED