X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d6c58d653b8f61eae0cc439fa7b4511fd1cf477..4393b50ccd24114090d61665ba737e64b755cbde:/include/wx/vector.h diff --git a/include/wx/vector.h b/include/wx/vector.h index 6dd37e3243..2034a9eaa8 100644 --- a/include/wx/vector.h +++ b/include/wx/vector.h @@ -5,7 +5,7 @@ // Modified by: // Created: 30.07.2001 // Copyright: (c) 2001 Lindsay Mathieson -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_VECTOR_H_ @@ -13,7 +13,7 @@ #include "wx/defs.h" -class WXDLLEXPORT wxVectorBase +class WXDLLIMPEXP_BASE wxVectorBase { public: typedef size_t size_type; @@ -126,8 +126,7 @@ public: wxVectorBase& operator = (const wxVectorBase& vb) { - bool rc = copy(vb); - wxASSERT(rc); + wxCHECK(copy(vb), *this); return *this; } }; @@ -146,8 +145,7 @@ public:\ cls() {}\ cls(const cls& c)\ {\ - bool rc = copy(c);\ - wxASSERT(rc);\ + wxCHECK2(copy(c), return);\ }\ ~cls()\ {\ @@ -161,8 +159,7 @@ class exp cls : public wxVectorBase\ public:\ void push_back(const obj& o)\ {\ - bool rc = Alloc(size() + 1);\ - wxASSERT(rc);\ + wxCHECK2(Alloc(size() + 1), return);\ Append(new obj(o));\ };\ void pop_back()\