1.1 --- a/epoc32/include/stdapis/stlportv5/slist Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/stdapis/stlportv5/slist Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -15,27 +15,37 @@
1.4 #ifndef _STLP_SLIST
1.5 #define _STLP_SLIST
1.6
1.7 -# ifndef _STLP_OUTERMOST_HEADER_ID
1.8 +#ifndef _STLP_OUTERMOST_HEADER_ID
1.9 # define _STLP_OUTERMOST_HEADER_ID 0x58
1.10 # include <stl/_prolog.h>
1.11 -# endif
1.12 +#endif
1.13
1.14 -# ifdef _STLP_PRAGMA_ONCE
1.15 +#ifdef _STLP_PRAGMA_ONCE
1.16 # pragma once
1.17 -# endif
1.18 +#endif
1.19 +
1.20 +#if defined (_STLP_NO_EXTENSIONS)
1.21 +/* Comment following if you want to use the slist constainer even if you ask for
1.22 + * no extension.
1.23 + */
1.24 +# error The slist class is an STLport extension.
1.25 +#endif
1.26
1.27 #ifndef _STLP_INTERNAL_SLIST_H
1.28 -# include <stl/_slist.h>
1.29 +# include <stl/_slist.h>
1.30 #endif
1.31
1.32 -#if defined (_STLP_WHOLE_VENDOR_STD)
1.33 -# include _STLP_NATIVE_HEADER(slist)
1.34 +#if defined (_STLP_IMPORT_VENDOR_STD)
1.35 +//This is not a Standard header, it might failed for most of
1.36 +//the compilers so we comment it for the moment. Should be uncommented
1.37 +//on a compiler basis.
1.38 +//# include _STLP_NATIVE_HEADER(slist)
1.39 #endif
1.40
1.41 -# if (_STLP_OUTERMOST_HEADER_ID == 0x58)
1.42 +#if (_STLP_OUTERMOST_HEADER_ID == 0x58)
1.43 # include <stl/_epilog.h>
1.44 # undef _STLP_OUTERMOST_HEADER_ID
1.45 -# endif
1.46 +#endif
1.47
1.48 #endif /* _STLP_SLIST */
1.49