From 39bf2efdc980f800219cb488c24eef3ef6be5c5c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 16 Dec 2013 19:28:11 +0000 Subject: [PATCH] Revert template_nested_typemaps to what it was before nested merge The breaks were fixed in the last couple of commits --- Examples/test-suite/template_nested_typemaps.i | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Examples/test-suite/template_nested_typemaps.i b/Examples/test-suite/template_nested_typemaps.i index b40e7e291..54f5bc503 100644 --- a/Examples/test-suite/template_nested_typemaps.i +++ b/Examples/test-suite/template_nested_typemaps.i @@ -4,22 +4,18 @@ // Testing that the typemaps invoked within a class via %template are picked up by appropriate methods -%inline %{ template struct Typemap { -#ifdef SWIG %typemap(in) T { $1 = -99; } -#endif }; template <> struct Typemap { // Note explicit specialization -#ifdef SWIG %typemap(in) short { $1 = -77; } -#endif }; +%inline %{ int globalInt1(int s) { return s; } short globalShort1(short s) { return s; }