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

Improve backwards compatibility in Java std::vector wrappers

Browse source 
For users who have typemaps for the parameters in the add and set methods
(now called doAdd and doSet).
Also for users who have typemaps for the get method - revert the return
type for get (now called doGet) back to the same return type as
std::vector::at. Correct definitions of const_reference to match the
those in the (C++11) standard.
This commit is contained in:
William S Fulton 2019-04-18 23:24:43 +01:00
commit 05c8c972cc
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/java/std_vector.i
View file

@ -105,14 +105,14 @@ SWIGINTERN jint SWIG_VectorSize(size_t size) {
return SWIG_VectorSize(self->size()); return SWIG_VectorSize(self->size());
} }
void doAdd(const value_type& value) { void doAdd(const value_type& x) {
self->push_back(value); self->push_back(x);
} }
void doAdd(jint index, const value_type& value) throw (std::out_of_range) { void doAdd(jint index, const value_type& x) throw (std::out_of_range) {
jint size = static_cast<jint>(self->size()); jint size = static_cast<jint>(self->size());
if (0 <= index && index <= size) { if (0 <= index && index <= size) {
self->insert(self->begin() + index, value); self->insert(self->begin() + index, x);
} else { } else {
throw std::out_of_range("vector index out of range"); throw std::out_of_range("vector index out of range");
} }
@ -129,7 +129,7 @@ SWIGINTERN jint SWIG_VectorSize(size_t size) {
} }
} }
CONST_REFERENCE doGet(jint index) throw (std::out_of_range) { const_reference doGet(jint index) throw (std::out_of_range) {
jint size = static_cast<jint>(self->size()); jint size = static_cast<jint>(self->size());
if (index >= 0 && index < size) if (index >= 0 && index < size)
return (*self)[index]; return (*self)[index];
@ -137,11 +137,11 @@ SWIGINTERN jint SWIG_VectorSize(size_t size) {
throw std::out_of_range("vector index out of range"); throw std::out_of_range("vector index out of range");
} }
value_type doSet(jint index, const value_type& value) throw (std::out_of_range) { value_type doSet(jint index, const value_type& val) throw (std::out_of_range) {
jint size = static_cast<jint>(self->size()); jint size = static_cast<jint>(self->size());
if (index >= 0 && index < size) { if (index >= 0 && index < size) {
CTYPE const old_value = (*self)[index]; CTYPE const old_value = (*self)[index];
(*self)[index] = value; (*self)[index] = val;
return old_value; return old_value;
} }
else else
@ -169,7 +169,7 @@ SWIGINTERN jint SWIG_VectorSize(size_t size) {
namespace std { namespace std {
template<class T> class vector { template<class T> class vector {
SWIG_STD_VECTOR_MINIMUM_INTERNAL(T, const T&) SWIG_STD_VECTOR_MINIMUM_INTERNAL(T, const value_type&)
}; };
// bool specialization // bool specialization