diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/hash_set --- a/epoc32/include/stdapis/stlportv5/hash_set Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/stdapis/stlportv5/hash_set Wed Mar 31 12:33:34 2010 +0100 @@ -2,13 +2,13 @@ * Copyright (c) 1996,1997 * Silicon Graphics Computer Systems, Inc. * - * Copyright (c) 1999 + * Copyright (c) 1999 * Boris Fomitchev * * This material is provided "as is", with absolutely no warranty expressed * or implied. Any use is at your own risk. * - * Permission to use or copy this software for any purpose is hereby granted + * Permission to use or copy this software for any purpose is hereby granted * without fee, provided the above notices are retained on all copies. * Permission to modify the code and to distribute modified code is granted, * provided the above notices are retained, and a notice that the code was @@ -19,21 +19,28 @@ #ifndef _STLP_HASH_SET #define _STLP_HASH_SET -# ifndef _STLP_OUTERMOST_HEADER_ID +#ifndef _STLP_OUTERMOST_HEADER_ID # define _STLP_OUTERMOST_HEADER_ID 0x4029 # include -# endif +#endif -# ifdef _STLP_PRAGMA_ONCE +#ifdef _STLP_PRAGMA_ONCE # pragma once -# endif +#endif + +#if defined (_STLP_NO_EXTENSIONS) +/* Comment following if you want to use hash constainers even if you ask for + * no extension. + */ +# error The hash_set and hash_multiset class are STLport extensions. +#endif #include -# if (_STLP_OUTERMOST_HEADER_ID == 0x4029) +#if (_STLP_OUTERMOST_HEADER_ID == 0x4029) # include # undef _STLP_OUTERMOST_HEADER_ID -# endif +#endif #endif /* _STLP_HASH_SET */