jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

forgotten checkin to remove some warnings on VC++

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6715 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2004-11-11 21:50:54 +00:00
commit 5849077aa0
1 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
SWIG/Lib/csharp/std_vector.i
View file

@ -188,22 +188,19 @@
return pv; return pv;
} }
CTYPE getitemcopy(int index) { CTYPE getitemcopy(int index) {
int size = int(self->size()); if (index>=0 && index<(int)self->size())
if (index>=0 && index<size)
return (*self)[index]; return (*self)[index];
else else
throw std::out_of_range("index"); throw std::out_of_range("index");
} }
const CTYPE& getitem(int index) { const CTYPE& getitem(int index) {
int size = int(self->size()); if (index>=0 && index<(int)self->size())
if (index>=0 && index<size)
return (*self)[index]; return (*self)[index];
else else
throw std::out_of_range("index"); throw std::out_of_range("index");
} }
void setitem(int index, const CTYPE& value) { void setitem(int index, const CTYPE& value) {
int size = int(self->size()); if (index>=0 && index<(int)self->size())
if (index>=0 && index<size)
(*self)[index] = value; (*self)[index] = value;
else else
throw std::out_of_range("index"); throw std::out_of_range("index");
@ -214,8 +211,8 @@
} }
// Takes a deep copy of the elements unlike ArrayList.GetRange // Takes a deep copy of the elements unlike ArrayList.GetRange
std::vector<CTYPE > *GetRange(int index, int count) { std::vector<CTYPE > *GetRange(int index, int count) {
if (index>=0 && index<self->size()+1) if (index>=0 && index<(int)self->size()+1)
if (count >= 0 && index+count <= self->size()) if (count >= 0 && index+count <= (int)self->size())
return new std::vector<CTYPE >(self->begin()+index, self->begin()+index+count); return new std::vector<CTYPE >(self->begin()+index, self->begin()+index+count);
else else
throw "count too large or negative."; throw "count too large or negative.";
@ -223,27 +220,27 @@
throw std::out_of_range("index"); throw std::out_of_range("index");
} }
void Insert(int index, const CTYPE& value) { void Insert(int index, const CTYPE& value) {
if (index>=0 && index<self->size()+1) if (index>=0 && index<(int)self->size()+1)
self->insert(self->begin()+index, value); self->insert(self->begin()+index, value);
else else
throw std::out_of_range("index"); throw std::out_of_range("index");
} }
// Takes a deep copy of the elements unlike ArrayList.InsertRange // Takes a deep copy of the elements unlike ArrayList.InsertRange
void InsertRange(int index, const std::vector<CTYPE >& values) { void InsertRange(int index, const std::vector<CTYPE >& values) {
if (index>=0 && index<self->size()+1) if (index>=0 && index<(int)self->size()+1)
self->insert(self->begin()+index, values.begin(), values.end()); self->insert(self->begin()+index, values.begin(), values.end());
else else
throw std::out_of_range("index"); throw std::out_of_range("index");
} }
void RemoveAt(int index) { void RemoveAt(int index) {
if (index>=0 && index<self->size()) if (index>=0 && index<(int)self->size())
self->erase(self->begin() + index); self->erase(self->begin() + index);
else else
throw std::out_of_range("index"); throw std::out_of_range("index");
} }
void RemoveRange(int index, int count) { void RemoveRange(int index, int count) {
if (index>=0 && index<self->size()+1) if (index>=0 && index<(int)self->size()+1)
if (count >= 0 && index+count <= self->size()) if (count >= 0 && index+count <= (int)self->size())
self->erase(self->begin()+index, self->begin()+index+count); self->erase(self->begin()+index, self->begin()+index+count);
else else
throw "count too large or negative."; throw "count too large or negative.";
@ -259,8 +256,8 @@
std::reverse(self->begin(), self->end()); std::reverse(self->begin(), self->end());
} }
void Reverse(int index, int count) { void Reverse(int index, int count) {
if (index>=0 && index<self->size()+1) if (index>=0 && index<(int)self->size()+1)
if (count >= 0 && index+count <= self->size()) if (count >= 0 && index+count <= (int)self->size())
std::reverse(self->begin()+index, self->begin()+index+count); std::reverse(self->begin()+index, self->begin()+index+count);
else else
throw "count too large or negative."; throw "count too large or negative.";
@ -269,7 +266,7 @@
} }
// Takes a deep copy of the elements unlike ArrayList.SetRange // Takes a deep copy of the elements unlike ArrayList.SetRange
void SetRange(int index, const std::vector<CTYPE >& values) { void SetRange(int index, const std::vector<CTYPE >& values) {
if (index>=0 && index<self->size()+1) if (index>=0 && index<(int)self->size()+1)
if (index+values.size() <= self->size()) if (index+values.size() <= self->size())
std::copy(values.begin(), values.end(), self->begin()+index); std::copy(values.begin(), values.end(), self->begin()+index);
else else