From 31df3077b3a2fcfd50e84289d0ec67bf1ba7cebe Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 21 Dec 2014 20:41:31 +0000 Subject: [PATCH] nested_scope test fixes for clang --- Examples/test-suite/nested_scope.i | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Examples/test-suite/nested_scope.i b/Examples/test-suite/nested_scope.i index b1515f77f..d89ba6ab7 100644 --- a/Examples/test-suite/nested_scope.i +++ b/Examples/test-suite/nested_scope.i @@ -26,17 +26,23 @@ namespace ns { #endif }; } -#ifndef __clang__ class Outer1 { struct Nested1; public: struct Nested2; +#ifdef __clang__ + struct Nested2 { + int data; + }; +#endif template class Abstract; class Real; }; +#ifndef __clang__ struct Outer1::Nested2 { int data; }; +#endif class Class { public: @@ -47,18 +53,15 @@ namespace ns { template class Class::Abstract { public: virtual void Method() = 0; + virtual ~Abstract() {} }; -#endif %} -#ifndef __clang__ - %template(abstract_int) Class::Abstract ; -#endif + +%template(abstract_int) Class::Abstract ; + %inline %{ -#ifndef __clang__ class Class::Real : public Abstract { public: virtual void Method() {} }; -#endif - %}