1.1 --- a/epoc32/include/stdapis/stlportv5/utility Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/stdapis/stlportv5/utility Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -6,13 +6,13 @@
1.4 * Copyright (c) 1996,1997
1.5 * Silicon Graphics Computer Systems, Inc.
1.6 *
1.7 - * Copyright (c) 1999
1.8 + * Copyright (c) 1999
1.9 * Boris Fomitchev
1.10 *
1.11 * This material is provided "as is", with absolutely no warranty expressed
1.12 * or implied. Any use is at your own risk.
1.13 *
1.14 - * Permission to use or copy this software for any purpose is hereby granted
1.15 + * Permission to use or copy this software for any purpose is hereby granted
1.16 * without fee, provided the above notices are retained on all copies.
1.17 * Permission to modify the code and to distribute modified code is granted,
1.18 * provided the above notices are retained, and a notice that the code was
1.19 @@ -23,39 +23,39 @@
1.20 #ifndef _STLP_UTILITY
1.21 #define _STLP_UTILITY
1.22
1.23 -# ifndef _STLP_OUTERMOST_HEADER_ID
1.24 +#ifndef _STLP_OUTERMOST_HEADER_ID
1.25 # define _STLP_OUTERMOST_HEADER_ID 0x75
1.26 # include <stl/_prolog.h>
1.27 -# endif
1.28 +#endif
1.29
1.30 -# ifdef _STLP_PRAGMA_ONCE
1.31 +#ifdef _STLP_PRAGMA_ONCE
1.32 # pragma once
1.33 -# endif
1.34 +#endif
1.35
1.36 -# ifndef __TYPE_TRAITS_H
1.37 +#ifndef __TYPE_TRAITS_H
1.38 # include <stl/type_traits.h>
1.39 -# endif
1.40 +#endif
1.41
1.42 -# if !defined (_STLP_DEBUG_H) && (defined (_STLP_DEBUG) || defined (_STLP_ASSERTIONS))
1.43 +#if !defined (_STLP_DEBUG_H) && (defined (_STLP_DEBUG) || defined (_STLP_ASSERTIONS))
1.44 # include <stl/debug/_debug.h>
1.45 -# endif
1.46 +#endif
1.47
1.48 -# ifndef _STLP_INTERNAL_PAIR_H
1.49 +#ifndef _STLP_INTERNAL_PAIR_H
1.50 # include <stl/_pair.h>
1.51 -# endif
1.52 +#endif
1.53
1.54 -# if defined (_STLP_IMPORT_VENDOR_STD)
1.55 +#if defined (_STLP_IMPORT_VENDOR_STD)
1.56 # include _STLP_NATIVE_HEADER(utility)
1.57 -# else
1.58 -# if defined (_STLP_MSVC) && ! defined (_STLP_INTERNAL_ITERATOR_H)
1.59 -# include <stl/_iterator.h>
1.60 +#else
1.61 +# if defined (_STLP_MSVC) && !defined (_STLP_INTERNAL_ITERATOR_H)
1.62 +# include <stl/_iterator.h>
1.63 # endif
1.64 -# endif
1.65 +#endif
1.66
1.67 -# if (_STLP_OUTERMOST_HEADER_ID == 0x75)
1.68 +#if (_STLP_OUTERMOST_HEADER_ID == 0x75)
1.69 # include <stl/_epilog.h>
1.70 # undef _STLP_OUTERMOST_HEADER_ID
1.71 -# endif
1.72 +#endif
1.73
1.74 #endif /* _STLP_UTILITY */
1.75