1.1 --- a/epoc32/include/stdapis/stlportv5/memory Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/stdapis/stlportv5/memory Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -2,13 +2,13 @@
1.4 * Copyright (c) 1997-1999
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 @@ -17,50 +17,50 @@
1.20 */
1.21
1.22 #ifndef _STLP_MEMORY
1.23 -# define _STLP_MEMORY
1.24 +#define _STLP_MEMORY
1.25
1.26 -# ifndef _STLP_OUTERMOST_HEADER_ID
1.27 +#ifndef _STLP_OUTERMOST_HEADER_ID
1.28 # define _STLP_OUTERMOST_HEADER_ID 0x46
1.29 # include <stl/_prolog.h>
1.30 -# endif
1.31 +#endif
1.32
1.33 -# ifdef _STLP_PRAGMA_ONCE
1.34 +#ifdef _STLP_PRAGMA_ONCE
1.35 # pragma once
1.36 -# endif
1.37 +#endif
1.38
1.39 -# ifndef _STLP_INTERNAL_ALLOC_H
1.40 +#ifndef _STLP_INTERNAL_ALLOC_H
1.41 # include <stl/_alloc.h>
1.42 -# endif
1.43 +#endif
1.44
1.45 -# ifndef _STLP_INTERNAL_TEMPBUF_H
1.46 +#ifndef _STLP_INTERNAL_TEMPBUF_H
1.47 # include <stl/_tempbuf.h>
1.48 -# endif
1.49 +#endif
1.50
1.51 -# ifndef _STLP_INTERNAL_RAW_STORAGE_ITER_H
1.52 +#ifndef _STLP_INTERNAL_RAW_STORAGE_ITER_H
1.53 # include <stl/_raw_storage_iter.h>
1.54 -# endif
1.55 +#endif
1.56
1.57 -# include <stl/_auto_ptr.h>
1.58 +#include <stl/_auto_ptr.h>
1.59
1.60 -# if defined (_STLP_IMPORT_VENDOR_STD)
1.61 +#if defined (_STLP_IMPORT_VENDOR_STD)
1.62
1.63 # if defined (__MSL__)
1.64 -# include _STLP_NATIVE_HEADER(limits)
1.65 +# include _STLP_NATIVE_HEADER(limits)
1.66 # endif
1.67
1.68 # include _STLP_NATIVE_HEADER(memory)
1.69
1.70 -# if defined (__MSL__) && (__MSL__ >= 0x2405 && __MSL__ < 0x5201)
1.71 -/* 980401 vss MSL 2.4 Pro 3 Release */
1.72 -# include <new_mem.h>
1.73 +# if defined (__MSL__) && (__MSL__ >= 0x2405 && __MSL__ < 0x5201)
1.74 +/* 980401 vss MSL 2.4 Pro 3 Release */
1.75 +# include <new_mem.h>
1.76 # endif
1.77
1.78 -# endif
1.79 +#endif
1.80
1.81 -# if (_STLP_OUTERMOST_HEADER_ID == 0x46)
1.82 +#if (_STLP_OUTERMOST_HEADER_ID == 0x46)
1.83 # include <stl/_epilog.h>
1.84 # undef _STLP_OUTERMOST_HEADER_ID
1.85 -# endif
1.86 +#endif
1.87
1.88 #endif /* _STLP_MEMORY */
1.89