1.1 --- a/epoc32/include/stdapis/boost/config/no_tr1/complex.hpp Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/stdapis/boost/config/no_tr1/complex.hpp Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -2,31 +2,27 @@
1.4 // Use, modification and distribution are subject to the
1.5 // Boost Software License, Version 1.0. (See accompanying file
1.6 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
1.7 +//
1.8 +// The aim of this header is just to include <complex> but to do
1.9 +// so in a way that does not result in recursive inclusion of
1.10 +// the Boost TR1 components if boost/tr1/tr1/complex is in the
1.11 +// include search path. We have to do this to avoid circular
1.12 +// dependencies:
1.13 +//
1.14
1.15 -#ifndef BOOST_MATH_COMPLEX_INCLUDED
1.16 -#define BOOST_MATH_COMPLEX_INCLUDED
1.17 +#ifndef BOOST_CONFIG_COMPLEX
1.18 +# define BOOST_CONFIG_COMPLEX
1.19
1.20 -#ifndef BOOST_MATH_COMPLEX_ASIN_INCLUDED
1.21 -# include <boost/math/complex/asin.hpp>
1.22 +# ifndef BOOST_TR1_NO_RECURSION
1.23 +# define BOOST_TR1_NO_RECURSION
1.24 +# define BOOST_CONFIG_NO_COMPLEX_RECURSION
1.25 +# endif
1.26 +
1.27 +# include <complex>
1.28 +
1.29 +# ifdef BOOST_CONFIG_NO_COMPLEX_RECURSION
1.30 +# undef BOOST_TR1_NO_RECURSION
1.31 +# undef BOOST_CONFIG_NO_COMPLEX_RECURSION
1.32 +# endif
1.33 +
1.34 #endif
1.35 -#ifndef BOOST_MATH_COMPLEX_ASINH_INCLUDED
1.36 -# include <boost/math/complex/asinh.hpp>
1.37 -#endif
1.38 -#ifndef BOOST_MATH_COMPLEX_ACOS_INCLUDED
1.39 -# include <boost/math/complex/acos.hpp>
1.40 -#endif
1.41 -#ifndef BOOST_MATH_COMPLEX_ACOSH_INCLUDED
1.42 -# include <boost/math/complex/acosh.hpp>
1.43 -#endif
1.44 -#ifndef BOOST_MATH_COMPLEX_ATAN_INCLUDED
1.45 -# include <boost/math/complex/atan.hpp>
1.46 -#endif
1.47 -#ifndef BOOST_MATH_COMPLEX_ATANH_INCLUDED
1.48 -# include <boost/math/complex/atanh.hpp>
1.49 -#endif
1.50 -#ifndef BOOST_MATH_COMPLEX_FABS_INCLUDED
1.51 -# include <boost/math/complex/fabs.hpp>
1.52 -#endif
1.53 -
1.54 -
1.55 -#endif // BOOST_MATH_COMPLEX_INCLUDED