nspace tests result in a warning if %nspace not supported where before it sometimes resulted in an error in the testsuite
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12981 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
5effbc386c
commit
449599c8f3
4 changed files with 9 additions and 1 deletions
|
|
@ -57,7 +57,6 @@ Version 2.0.5 (in progress)
|
||||||
[Octave] Use -globals . to load global variables in module namespace
|
[Octave] Use -globals . to load global variables in module namespace
|
||||||
[Octave] Comment declaration of unimplemented function swig_register_director
|
[Octave] Comment declaration of unimplemented function swig_register_director
|
||||||
[Octave] Fix OCTAVE_PATH in octave Makefiles
|
[Octave] Fix OCTAVE_PATH in octave Makefiles
|
||||||
[Octave] Add support for nspace feature - fix director_nspace test
|
|
||||||
[Octave] Add support for std::list - fix li_std_containers_int test
|
[Octave] Add support for std::list - fix li_std_containers_int test
|
||||||
[Octave] Fix imports test
|
[Octave] Fix imports test
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,13 @@ namespace Bar
|
||||||
|
|
||||||
%include <std_string.i>
|
%include <std_string.i>
|
||||||
|
|
||||||
|
// nspace feature only supported by these languages
|
||||||
|
#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGD)
|
||||||
%nspace Bar::Foo;
|
%nspace Bar::Foo;
|
||||||
%nspace Bar::FooBar;
|
%nspace Bar::FooBar;
|
||||||
|
#else
|
||||||
|
#warning nspace feature not yet supported in this target language
|
||||||
|
#endif
|
||||||
|
|
||||||
%feature("director") Bar::Foo;
|
%feature("director") Bar::Foo;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -103,5 +103,7 @@ struct GlobalClass {
|
||||||
void test_classes(Outer::SomeClass c, Outer::Inner2::Color cc) {}
|
void test_classes(Outer::SomeClass c, Outer::Inner2::Color cc) {}
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
#else
|
||||||
|
#warning nspace feature not yet supported in this target language
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,5 +49,7 @@ namespace Outer {
|
||||||
const Outer::Inner2::Color& col2c) {}
|
const Outer::Inner2::Color& col2c) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
#warning nspace feature not yet supported in this target language
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue