Revert template_nested_typemaps to what it was before nested merge
The breaks were fixed in the last couple of commits
This commit is contained in:
parent
5487345ce7
commit
39bf2efdc9
1 changed files with 1 additions and 5 deletions
|
|
@ -4,22 +4,18 @@
|
||||||
|
|
||||||
// Testing that the typemaps invoked within a class via %template are picked up by appropriate methods
|
// Testing that the typemaps invoked within a class via %template are picked up by appropriate methods
|
||||||
|
|
||||||
%inline %{
|
|
||||||
template <typename T> struct Typemap {
|
template <typename T> struct Typemap {
|
||||||
#ifdef SWIG
|
|
||||||
%typemap(in) T {
|
%typemap(in) T {
|
||||||
$1 = -99;
|
$1 = -99;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
template <> struct Typemap<short> { // Note explicit specialization
|
template <> struct Typemap<short> { // Note explicit specialization
|
||||||
#ifdef SWIG
|
|
||||||
%typemap(in) short {
|
%typemap(in) short {
|
||||||
$1 = -77;
|
$1 = -77;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
%inline %{
|
||||||
int globalInt1(int s) { return s; }
|
int globalInt1(int s) { return s; }
|
||||||
short globalShort1(short s) { return s; }
|
short globalShort1(short s) { return s; }
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue