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

Use value_type to to more closely match the STL declarations and work around some bugs in some compilers for pointer references (when the type is a pointer)

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8067 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2005-12-26 23:23:58 +00:00
commit fa84803fbb
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,12 @@
* The C# wrapper is made to look and feel like a typesafe C# System.Collections.ArrayList * The C# wrapper is made to look and feel like a typesafe C# System.Collections.ArrayList
* All the methods in IList are defined, but we don't derive from IList as this is a typesafe collection. * All the methods in IList are defined, but we don't derive from IList as this is a typesafe collection.
* Warning: heavy macro usage in this file. Use swig -E to get a sane view on the real file contents! * Warning: heavy macro usage in this file. Use swig -E to get a sane view on the real file contents!
*
* Very often the C# generated code will not compile as the C++ template type is not the same as the C#
* proxy type, so use the SWIG_STD_VECTOR_SPECIALIZE or SWIG_STD_VECTOR_SPECIALIZE_MINIMUM macro, eg
*
* SWIG_STD_VECTOR_SPECIALIZE_MINIMUM(Klass, SomeNamespace::Klass)
* %template(VectKlass) std::vector<SomeNamespace::Klass>;
*/ */
%include <std_common.i> %include <std_common.i>
@ -163,15 +169,16 @@
public: public:
typedef size_t size_type; typedef size_t size_type;
typedef CTYPE value_type;
%rename(Clear) clear; %rename(Clear) clear;
void clear(); void clear();
%rename(Add) push_back; %rename(Add) push_back;
void push_back(const CTYPE& value); void push_back(const value_type& value);
size_type size() const; size_type size() const;
size_type capacity() const; size_type capacity() const;
void reserve(size_type n); void reserve(size_type n);
%newobject GetRange(int index, int count); %newobject GetRange(int index, int count);
%newobject Repeat(const CTYPE& value, int count); %newobject Repeat(const value_type& value, int count);
vector(); vector();
%extend { %extend {
vector(int capacity) throw (std::out_of_range) { vector(int capacity) throw (std::out_of_range) {
@ -190,13 +197,13 @@
else else
throw std::out_of_range("index"); throw std::out_of_range("index");
} }
const CTYPE& getitem(int index) throw (std::out_of_range) { const value_type& getitem(int index) throw (std::out_of_range) {
if (index>=0 && index<(int)self->size()) if (index>=0 && index<(int)self->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) throw (std::out_of_range) { void setitem(int index, const value_type& value) throw (std::out_of_range) {
if (index>=0 && index<(int)self->size()) if (index>=0 && index<(int)self->size())
(*self)[index] = value; (*self)[index] = value;
else else
@ -216,7 +223,7 @@
throw std::invalid_argument("invalid range"); throw std::invalid_argument("invalid range");
return new std::vector<CTYPE >(self->begin()+index, self->begin()+index+count); return new std::vector<CTYPE >(self->begin()+index, self->begin()+index+count);
} }
void Insert(int index, const CTYPE& value) throw (std::out_of_range) { void Insert(int index, const value_type& value) throw (std::out_of_range) {
if (index>=0 && index<(int)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
@ -244,7 +251,7 @@
throw std::invalid_argument("invalid range"); throw std::invalid_argument("invalid range");
self->erase(self->begin()+index, self->begin()+index+count); self->erase(self->begin()+index, self->begin()+index+count);
} }
static std::vector<CTYPE > *Repeat(const CTYPE& value, int count) throw (std::out_of_range) { static std::vector<CTYPE > *Repeat(const value_type& value, int count) throw (std::out_of_range) {
if (count < 0) if (count < 0)
throw std::out_of_range("count"); throw std::out_of_range("count");
return new std::vector<CTYPE >(count, value); return new std::vector<CTYPE >(count, value);
@ -276,24 +283,24 @@
// CSTYPE and CTYPE respectively correspond to the types in the cstype and ctype typemaps // CSTYPE and CTYPE respectively correspond to the types in the cstype and ctype typemaps
%define SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(CSTYPE, CTYPE...) %define SWIG_STD_VECTOR_EXTRA_OP_EQUALS_EQUALS(CSTYPE, CTYPE...)
%extend { %extend {
bool Contains(const CTYPE& value) { bool Contains(const value_type& value) {
return std::find(self->begin(), self->end(), value) != self->end(); return std::find(self->begin(), self->end(), value) != self->end();
} }
int IndexOf(const CTYPE& value) { int IndexOf(const value_type& value) {
int index = -1; int index = -1;
std::vector<CTYPE >::iterator it = std::find(self->begin(), self->end(), value); std::vector<CTYPE >::iterator it = std::find(self->begin(), self->end(), value);
if (it != self->end()) if (it != self->end())
index = it - self->begin(); index = it - self->begin();
return index; return index;
} }
int LastIndexOf(const CTYPE& value) { int LastIndexOf(const value_type& value) {
int index = -1; int index = -1;
std::vector<CTYPE >::reverse_iterator rit = std::find(self->rbegin(), self->rend(), value); std::vector<CTYPE >::reverse_iterator rit = std::find(self->rbegin(), self->rend(), value);
if (rit != self->rend()) if (rit != self->rend())
index = self->rend() - 1 - rit; index = self->rend() - 1 - rit;
return index; return index;
} }
void Remove(const CTYPE& value) { void Remove(const value_type& value) {
std::vector<CTYPE >::iterator it = std::find(self->begin(), self->end(), value); std::vector<CTYPE >::iterator it = std::find(self->begin(), self->end(), value);
if (it != self->end()) if (it != self->end())
self->erase(it); self->erase(it);