1.1 --- a/epoc32/include/stdapis/stlportv5/queue	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/queue	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -9,13 +9,13 @@
     1.4   * Copyright (c) 1997
     1.5   * Moscow Center for SPARC Technology
     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 @@ -26,27 +26,31 @@
    1.20  #ifndef _STLP_QUEUE
    1.21  #define _STLP_QUEUE
    1.22  
    1.23 -# ifndef _STLP_OUTERMOST_HEADER_ID
    1.24 +#ifndef _STLP_OUTERMOST_HEADER_ID
    1.25  #  define _STLP_OUTERMOST_HEADER_ID 0x53
    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 _STLP_INTERNAL_QUEUE_H
    1.37 -# include <stl/_queue.h>
    1.38 +#  include <stl/_queue.h>
    1.39  #endif
    1.40  
    1.41 -#ifndef _STLP_INTERNAL_FUNCTION_H
    1.42 -# include <functional>
    1.43 +#ifndef _STLP_FUNCTIONAL
    1.44 +#  include <functional>
    1.45  #endif
    1.46  
    1.47 -# if (_STLP_OUTERMOST_HEADER_ID == 0x53)
    1.48 +#if defined (_STLP_IMPORT_VENDOR_STD)
    1.49 +#  include _STLP_NATIVE_HEADER(queue)
    1.50 +#endif
    1.51 +
    1.52 +#if (_STLP_OUTERMOST_HEADER_ID == 0x53)
    1.53  #  include <stl/_epilog.h>
    1.54  #  undef _STLP_OUTERMOST_HEADER_ID
    1.55 -# endif
    1.56 +#endif
    1.57  
    1.58  #endif /* _STLP_QUEUE */
    1.59