Fix using declarations and templates. %template was putting the
instantiated template into the global namespace instead of the namespace of the template definition. This fixes regression in swig-2.0.5 copying the std::pair typemaps which occurs with a 'using std::pair' declaration. This also fixes lots of other using declarations of template problems (template forward declarations. combinations using directives). git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13504 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
3e33774c8c
commit
54726b9d09
9 changed files with 339 additions and 7 deletions
|
|
@ -0,0 +1,133 @@
|
|||
%module template_using_directive_and_declaration_forward
|
||||
// Test using directives combined with using declarations and forward declarations (templates)
|
||||
|
||||
%inline %{
|
||||
namespace Outer1 {
|
||||
namespace Space1 {
|
||||
template<typename T> class Thing1;
|
||||
}
|
||||
}
|
||||
using namespace Outer1::Space1;
|
||||
using Outer1::Space1::Thing1;
|
||||
template<typename T> class Thing1 {};
|
||||
void useit1(Thing1<int> t) {}
|
||||
void useit1a(Outer1::Space1::Thing1<int> t) {}
|
||||
void useit1b(::Outer1::Space1::Thing1<int> t) {}
|
||||
namespace Outer1 {
|
||||
void useit1c(Space1::Thing1<int> t) {}
|
||||
}
|
||||
|
||||
|
||||
namespace Outer2 {
|
||||
namespace Space2 {
|
||||
template<typename T> class Thing2;
|
||||
}
|
||||
}
|
||||
using namespace Outer2;
|
||||
using Space2::Thing2;
|
||||
template<typename T> class Thing2 {};
|
||||
// BROKEN void useit2(Thing2<int> t) {}
|
||||
void useit2a(Outer2::Space2::Thing2<int> t) {}
|
||||
void useit2b(::Outer2::Space2::Thing2<int> t) {}
|
||||
void useit2c(Space2::Thing2<int> t) {}
|
||||
namespace Outer2 {
|
||||
void useit2d(Space2::Thing2<int> t) {}
|
||||
}
|
||||
|
||||
|
||||
namespace Outer3 {
|
||||
namespace Space3 {
|
||||
namespace Middle3 {
|
||||
template<typename T> class Thing3;
|
||||
}
|
||||
}
|
||||
}
|
||||
using namespace Outer3;
|
||||
using namespace Space3;
|
||||
using Middle3::Thing3;
|
||||
template<typename T> class Thing3 {};
|
||||
// BROKEN void useit3(Thing3<int> t) {}
|
||||
void useit3a(Outer3::Space3::Middle3::Thing3<int> t) {}
|
||||
void useit3b(::Outer3::Space3::Middle3::Thing3<int> t) {}
|
||||
void useit3c(Middle3::Thing3<int> t) {}
|
||||
namespace Outer3 {
|
||||
namespace Space3 {
|
||||
void useit3d(Middle3::Thing3<int> t) {}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
namespace Outer4 {
|
||||
namespace Space4 {
|
||||
namespace Middle4 {
|
||||
template<typename T> class Thing4;
|
||||
}
|
||||
}
|
||||
}
|
||||
using namespace Outer4::Space4;
|
||||
using Middle4::Thing4;
|
||||
template<typename T> class Thing4 {};
|
||||
// BROKEN void useit4(Thing4<int> t) {}
|
||||
void useit4a(Outer4::Space4::Middle4::Thing4<int> t) {}
|
||||
void useit4b(::Outer4::Space4::Middle4::Thing4<int> t) {}
|
||||
void useit4c(Middle4::Thing4<int> t) {}
|
||||
namespace Outer4 {
|
||||
namespace Space4 {
|
||||
void useit4d(Middle4::Thing4<int> t) {}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
namespace Outer5 {
|
||||
namespace Space5 {
|
||||
namespace Middle5 {
|
||||
namespace More5 {
|
||||
template<typename T> class Thing5;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
using namespace ::Outer5::Space5;
|
||||
using namespace Middle5;
|
||||
using More5::Thing5;
|
||||
template<typename T> class Thing5 {};
|
||||
// BROKEN void useit5(Thing5<int> t) {}
|
||||
void useit5a(Outer5::Space5::Middle5::More5::Thing5<int> t) {}
|
||||
void useit5b(::Outer5::Space5::Middle5::More5::Thing5<int> t) {}
|
||||
void useit5c(Middle5::More5::Thing5<int> t) {}
|
||||
namespace Outer5 {
|
||||
namespace Space5 {
|
||||
void useit5d(Middle5::More5::Thing5<int> t) {}
|
||||
}
|
||||
}
|
||||
|
||||
namespace Outer7 {
|
||||
namespace Space7 {
|
||||
namespace Middle7 {
|
||||
template<typename T> class Thing7;
|
||||
}
|
||||
}
|
||||
}
|
||||
using namespace Outer7::Space7;
|
||||
template<typename T> class Middle7::Thing7 {};
|
||||
using Middle7::Thing7;
|
||||
// BROKEN void useit7(Thing7<int> t) {}
|
||||
void useit7a(Outer7::Space7::Middle7::Thing7<int> t) {}
|
||||
void useit7b(::Outer7::Space7::Middle7::Thing7<int> t) {}
|
||||
void useit7c(Middle7::Thing7<int> t) {}
|
||||
namespace Outer7 {
|
||||
namespace Space7 {
|
||||
void useit7d(Middle7::Thing7<int> t) {}
|
||||
}
|
||||
}
|
||||
|
||||
%}
|
||||
|
||||
%template(Thing1Int) Thing1<int>;
|
||||
%template(Thing2Int) Thing2<int>;
|
||||
%template(Thing3Int) Thing3<int>;
|
||||
%template(Thing4Int) Thing4<int>;
|
||||
%template(Thing5Int) Thing5<int>;
|
||||
%template(Thing7Int) Thing7<int>;
|
||||
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue