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

@@ -4,22 +4,18 @@
 
 // Testing that the typemaps invoked within a class via %template are picked up by appropriate methods
 
-%inline %{
 template <typename T> struct Typemap {
-#ifdef SWIG
   %typemap(in) T {
     $1 = -99;
   }
-#endif
 };
 template <> struct Typemap<short> { // Note explicit specialization
-#ifdef SWIG
   %typemap(in) short {
     $1 = -77;
   }
-#endif
 };
 
+%inline %{
 int globalInt1(int s) { return s; }
 short globalShort1(short s) { return s; }