removed superfluous semicolons

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-04-02 00:34:04 +00:00
parent 6d94009faa
commit 1f32f58565

View File

@@ -39,7 +39,7 @@ protected:
m_objects = (void **) mem; m_objects = (void **) mem;
m_capacity = sz; m_capacity = sz;
return true; return true;
}; }
// untyped destructor of elements - must be overriden // untyped destructor of elements - must be overriden
virtual void Free(void *) = 0; virtual void Free(void *) = 0;
@@ -50,14 +50,14 @@ protected:
{ {
wxASSERT(idx >= 0 && idx < m_size); wxASSERT(idx >= 0 && idx < m_size);
return m_objects[idx]; return m_objects[idx];
}; }
void Append(void *obj) void Append(void *obj)
{ {
wxASSERT(m_size < m_capacity); wxASSERT(m_size < m_capacity);
m_objects[m_size] = obj; m_objects[m_size] = obj;
m_size++; m_size++;
}; }
void RemoveAt(size_type idx) void RemoveAt(size_type idx)
{ {
@@ -69,7 +69,7 @@ protected:
m_objects + idx + 1, m_objects + idx + 1,
( m_size - idx - 1 ) * sizeof(void*) ); ( m_size - idx - 1 ) * sizeof(void*) );
m_size--; m_size--;
}; }
bool copy(const wxVectorBase& vb) bool copy(const wxVectorBase& vb)
{ {
@@ -83,10 +83,10 @@ protected:
if (! o) if (! o)
return false; return false;
Append(o); Append(o);
}; }
return true; return true;
}; }
public: public:
wxVectorBase() : m_allocsize(16), m_size(0), m_capacity(0), m_objects(0) {} wxVectorBase() : m_allocsize(16), m_size(0), m_capacity(0), m_objects(0) {}
@@ -99,7 +99,7 @@ public:
free(m_objects); free(m_objects);
m_objects = 0; m_objects = 0;
m_size = m_capacity = 0; m_size = m_capacity = 0;
}; }
void reserve(size_type n) void reserve(size_type n)
{ {
@@ -107,7 +107,7 @@ public:
{ {
wxFAIL_MSG( _T("out of memory in wxVector::reserve()") ); wxFAIL_MSG( _T("out of memory in wxVector::reserve()") );
} }
}; }
size_type size() const size_type size() const
{ {
@@ -117,12 +117,12 @@ public:
size_type capacity() const size_type capacity() const
{ {
return m_capacity; return m_capacity;
}; }
bool empty() const bool empty() const
{ {
return size() == 0; return size() == 0;
}; }
wxVectorBase& operator = (const wxVectorBase& vb) wxVectorBase& operator = (const wxVectorBase& vb)
{ {
@@ -136,11 +136,11 @@ private:\
virtual void Free(void *o)\ virtual void Free(void *o)\
{\ {\
delete (obj *) o;\ delete (obj *) o;\
};\ }\
virtual void *Copy(const void *o) const\ virtual void *Copy(const void *o) const\
{\ {\
return new obj(*(obj *) o);\ return new obj(*(obj *) o);\
};\ }\
public:\ public:\
cls() {}\ cls() {}\
cls(const cls& c)\ cls(const cls& c)\
@@ -161,48 +161,48 @@ public:\
{\ {\
wxCHECK2(Alloc(size() + 1), return);\ wxCHECK2(Alloc(size() + 1), return);\
Append(new obj(o));\ Append(new obj(o));\
};\ }\
void pop_back()\ void pop_back()\
{\ {\
RemoveAt(size() - 1);\ RemoveAt(size() - 1);\
};\ }\
const obj& at(size_type idx) const\ const obj& at(size_type idx) const\
{\ {\
return *(obj *) GetItem(idx);\ return *(obj *) GetItem(idx);\
};\ }\
obj& at(size_type idx)\ obj& at(size_type idx)\
{\ {\
return *(obj *) GetItem(idx);\ return *(obj *) GetItem(idx);\
};\ }\
const obj& operator[](size_type idx) const\ const obj& operator[](size_type idx) const\
{\ {\
return at(idx);\ return at(idx);\
};\ }\
obj& operator[](size_type idx)\ obj& operator[](size_type idx)\
{\ {\
return at(idx);\ return at(idx);\
};\ }\
const obj& front() const\ const obj& front() const\
{\ {\
return at(0);\ return at(0);\
};\ }\
obj& front()\ obj& front()\
{\ {\
return at(0);\ return at(0);\
};\ }\
const obj& back() const\ const obj& back() const\
{\ {\
return at(size() - 1);\ return at(size() - 1);\
};\ }\
obj& back()\ obj& back()\
{\ {\
return at(size() - 1);\ return at(size() - 1);\
};\ }\
size_type erase(size_type idx)\ size_type erase(size_type idx)\
{\ {\
RemoveAt(idx);\ RemoveAt(idx);\
return idx;\ return idx;\
};\ }\
} }
#define WX_DECLARE_VECTOR(obj, cls) \ #define WX_DECLARE_VECTOR(obj, cls) \