1.1 --- a/epoc32/include/stdapis/stlportv5/cassert	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/cassert	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,13 +1,11 @@
     1.4  /*
     1.5 - * © Portions copyright (c) 2006-2007 Nokia Corporation.  All rights reserved.
     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 @@ -15,24 +13,29 @@
    1.20   *
    1.21   */
    1.22  
    1.23 -# ifndef _STLP_OUTERMOST_HEADER_ID
    1.24 +#ifndef _STLP_OUTERMOST_HEADER_ID
    1.25  #  define _STLP_OUTERMOST_HEADER_ID 0x103
    1.26  #  include <stl/_prolog.h>
    1.27 -# endif
    1.28 +#elif (_STLP_OUTERMOST_HEADER_ID == 0x103) && ! defined (_STLP_DONT_POP_HEADER_ID)
    1.29 +#   define _STLP_DONT_POP_HEADER_ID
    1.30 +#endif
    1.31  
    1.32 +#if !defined (_STLP_WCE_EVC3)
    1.33 +#  if defined (_STLP_USE_NEW_C_HEADERS)
    1.34 +#    include _STLP_NATIVE_CPP_C_HEADER(cassert)
    1.35 +#  else
    1.36 +#    include <assert.h>
    1.37 +#  endif
    1.38 +#endif
    1.39  
    1.40 -# if defined (_STLP_USE_NEW_C_HEADERS) || defined (__IN_STLPORT_CASSERT)
    1.41 -#  include _STLP_NATIVE_CPP_C_HEADER(cassert)
    1.42 -# else
    1.43 -#  include <assert.h>
    1.44 -# endif
    1.45 -
    1.46 -
    1.47 -# if (_STLP_OUTERMOST_HEADER_ID == 0x103 )
    1.48 -#  include <stl/_epilog.h>
    1.49 -#  undef _STLP_OUTERMOST_HEADER_ID
    1.50 -# endif
    1.51 -
    1.52 +#if (_STLP_OUTERMOST_HEADER_ID == 0x103 )
    1.53 +#  if !defined (_STLP_DONT_POP_HEADER_ID)
    1.54 +#    include <stl/_epilog.h>
    1.55 +#    undef _STLP_OUTERMOST_HEADER_ID
    1.56 +#  else
    1.57 +#    undef _STLP_DONT_POP_HEADER_ID
    1.58 +#  endif
    1.59 +#endif
    1.60  
    1.61  // Local Variables:
    1.62  // mode:C++