Revert "DELETEME?: superficial changes not needed"

This reverts commit 9dddccadc4a0f280ae76fca02514cc1ecf288102.

Author: sethrj

Examples/test-suite/features.i

@@ -9,7 +9,7 @@
 // This testcase checks that %feature is working for templates and non user supplied constructors/destructors and is just generally working
 
 // If the default %exception is used it will not compile. It shouldn't get used.
-%exception "#error Exception code should not have been inserted;";
+%exception "this_will_not_compile";
 
 // Test 1: Test for no user supplied constructors and destructor
 %exception Simple::Simple(const Simple&) "$action /*Simple::Simple*/";

Examples/test-suite/member_pointer.i

@@ -119,7 +119,7 @@ PerimeterFunc_td perimetervar_td = &Shape::perimeter;
 /* Some constants */
 %constant double (Shape::*AREAPT)(void) = &Shape::area;
 %constant double (Shape::*PERIMPT)(void) = &Shape::perimeter;
-%constant double (Shape::*NULLPT)(void) = NULL;
+%constant double (Shape::*NULLPT)(void) = 0;
 
 /*
 %inline %{

Examples/test-suite/primitive_types.i

@@ -34,19 +34,19 @@
 
   to the following:
 
-  %typemap(in) const char & ($1_basetype temp),
-             const signed char & ($1_basetype temp),
-             const unsigned char & ($1_basetype temp),
-             const short & ($1_basetype temp),
-             const unsigned short & ($1_basetype temp),
-             const int & ($1_basetype temp),
-             const unsigned int & ($1_basetype temp),
-             const long & ($1_basetype temp),
-             const unsigned long & ($1_basetype temp),
-             const long long & ($1_basetype temp),
-             const float & ($1_basetype temp),
-             const double & ($1_basetype temp)
-  %{ temp = ($1_basetype)$input;  $1 = &temp; %}
+  %typemap(in) const char & ($basetype temp), 
+             const signed char & ($basetype temp), 
+             const unsigned char & ($basetype temp), 
+             const short & ($basetype temp), 
+             const unsigned short & ($basetype temp), 
+             const int & ($basetype temp), 
+             const unsigned int & ($basetype temp), 
+             const long & ($basetype temp), 
+             const unsigned long & ($basetype temp), 
+             const long long & ($basetype temp), 
+             const float & ($basetype temp), 
+             const double & ($basetype temp)
+  %{ temp = ($basetype)$input;  $1 = &temp; %}
 
   the other typical change is to add the enum SWIGTYPE to the
   integer throws typemaps:

Source/Swig/cwrap.c

@@ -1435,9 +1435,9 @@ int Swig_MembersetToFunction(Node *n, String *classname, int flags) {
     String *cres;
     String *code = Getattr(n, "code");
 
-    String *membername = Swig_name_member(0, classname, name);
-    String *sname = Swig_name_set(0, membername);
-    String *mangled = Swig_name_mangle(sname);
+    String *sname = Swig_name_set(0, name);
+    String *membername = Swig_name_member(0, classname, sname);
+    String *mangled = Swig_name_mangle(membername);
 
     if (code) {
       /* I don't think this ever gets run - WSF */
@@ -1517,9 +1517,9 @@ int Swig_MembergetToFunction(Node *n, String *classname, int flags) {
     String *cres;
     String *code = Getattr(n, "code");
 
-    String *membername = Swig_name_member(0, classname, name);
-    String *gname = Swig_name_get(0, membername);
-    String *mangled = Swig_name_mangle(gname);
+    String *gname = Swig_name_get(0, name);
+    String *membername = Swig_name_member(0, classname, gname);
+    String *mangled = Swig_name_mangle(membername);
 
     if (code) {
       /* I don't think this ever gets run - WSF */