summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorleo2001-01-07 15:01:51 +0000
committerleo2001-01-07 15:01:51 +0000
commit5e30e9a7197c6b4d233374ca88765d02114d97c3 (patch)
tree420aa6a315a80faf8233e0fafccdbfc9811080cd /common
parentab6d702f49536844ae19f30c884a9b5436e0f927 (diff)
Use signed ints to avoid warnings in the rest of the code
git-svn-id: http://svn.leocad.org/trunk@212 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'common')
-rwxr-xr-xcommon/array.cpp10
-rwxr-xr-xcommon/array.h16
2 files changed, 13 insertions, 13 deletions
diff --git a/common/array.cpp b/common/array.cpp
index 95c28bf..f8df023 100755
--- a/common/array.cpp
+++ b/common/array.cpp
@@ -6,7 +6,7 @@
#include <string.h>
template <class T>
-PtrArray<T>::PtrArray (unsigned long nSize)
+PtrArray<T>::PtrArray (int nSize)
{
m_pData = NULL;
m_nLength = 0;
@@ -23,7 +23,7 @@ PtrArray<T>::~PtrArray ()
}
template <class T>
-void PtrArray<T>::Expand (unsigned long nGrow)
+void PtrArray<T>::Expand (int nGrow)
{
if ((m_nLength + nGrow) > m_nAlloc)
{
@@ -34,7 +34,7 @@ void PtrArray<T>::Expand (unsigned long nGrow)
}
template <class T>
-void PtrArray<T>::SetSize (unsigned long nSize)
+void PtrArray<T>::SetSize (int nSize)
{
if (nSize > m_nLength)
Expand (nSize - m_nLength);
@@ -43,7 +43,7 @@ void PtrArray<T>::SetSize (unsigned long nSize)
}
template <class T>
-T* PtrArray<T>::RemoveIndex (unsigned long nIndex)
+T* PtrArray<T>::RemoveIndex (int nIndex)
{
T* ret = NULL;
@@ -65,7 +65,7 @@ T* PtrArray<T>::RemoveIndex (unsigned long nIndex)
template <class T>
T* PtrArray<T>::RemovePointer (T* pObj)
{
- unsigned long i;
+ int i;
for (i = 0; i < m_nLength; i++)
if (m_pData[i] == pObj)
diff --git a/common/array.h b/common/array.h
index bb235a9..c8ce59c 100755
--- a/common/array.h
+++ b/common/array.h
@@ -5,26 +5,26 @@ template <class T>
class PtrArray
{
public:
- PtrArray (unsigned long nSize = 0);
+ PtrArray (int nSize = 0);
~PtrArray ();
- void SetSize (unsigned long nSize);
- unsigned long GetSize () const
+ void SetSize (int nSize);
+ int GetSize () const
{ return m_nLength; }
- T* RemoveIndex (unsigned long nIndex);
+ T* RemoveIndex (int nIndex);
T* RemovePointer (T* pObj);
void Add (T* pObj);
- T* operator [](unsigned long nIndex) const
+ T* operator [](int nIndex) const
{ return m_pData[nIndex]; }
protected:
- void Expand (unsigned long nGrow);
+ void Expand (int nGrow);
T** m_pData;
- unsigned long m_nLength;
- unsigned long m_nAlloc;
+ int m_nLength;
+ int m_nAlloc;
};
#include "array.cpp"