1.1 --- a/epoc32/include/stdapis/stlportv5/stl/_stdexcept_base.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/_stdexcept_base.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,4 +1,6 @@
1.4 /*
1.5 + * Portions Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
1.6 + *
1.7 * Copyright (c) 1996,1997
1.8 * Silicon Graphics Computer Systems, Inc.
1.9 *
1.10 @@ -67,19 +69,19 @@
1.11
1.12 class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
1.13 public:
1.14 - __Named_exception(const string& __str)
1.15 + _STLP_DECLSPEC __Named_exception(const string& __str)
1.16 # ifndef _STLP_USE_NO_IOSTREAMS
1.17 ;
1.18 - const char* what() const _STLP_NOTHROW_INHERENTLY;
1.19 - ~__Named_exception() _STLP_NOTHROW_INHERENTLY;
1.20 + _STLP_DECLSPEC const char* what() const _STLP_NOTHROW_INHERENTLY;
1.21 + _STLP_DECLSPEC ~__Named_exception() _STLP_NOTHROW_INHERENTLY;
1.22 # else
1.23 {
1.24 # if !defined (_STLP_USE_SAFE_STRING_FUNCTIONS)
1.25 strncpy(_M_name, _STLP_PRIV __get_c_string(__str), _S_bufsize);
1.26 + _M_name[_S_bufsize - 1] = '\0';
1.27 # else
1.28 - strncpy_s(_STLP_ARRAY_AND_SIZE(_M_name), _STLP_PRIV __get_c_string(__str), _S_bufsize);
1.29 + strncpy_s(_STLP_ARRAY_AND_SIZE(_M_name), _STLP_PRIV __get_c_string(__str), _TRUNCATE);
1.30 # endif
1.31 - _M_name[_S_bufsize - 1] = '\0';
1.32 }
1.33 const char* what() const _STLP_NOTHROW_INHERENTLY { return _M_name; }
1.34 # endif