Another merge with master.

Change Doxygen error codes to start at 740 instead of at 720 as the latter was
taken by Scilab in the meanwhile.

Resolve conflicts in autodoc_runme.py once again.

Examples/test-suite/java/constant_directive_runme.java

@@ -0,0 +1,22 @@
+import constant_directive.*;
+
+public class constant_directive_runme {
+
+  static {
+    try {
+	System.loadLibrary("constant_directive");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    if (constant_directive.TYPE1_CONSTANT1.getVal() != 1)
+      throw new RuntimeException("fail");
+    if (constant_directive.TYPE1_CONSTANT2.getVal() != 2)
+      throw new RuntimeException("fail");
+    if (constant_directive.TYPE1_CONSTANT3.getVal() != 3)
+      throw new RuntimeException("fail");
+  }
+}

Examples/test-suite/java/nested_template_base_runme.java

@@ -0,0 +1,27 @@
+import nested_template_base.*;
+
+public class nested_template_base_runme {
+
+  static {
+    try {
+	System.loadLibrary("nested_template_base");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    OuterC.InnerS ois = new OuterC.InnerS(123);
+    OuterC.InnerC oic = new OuterC.InnerC();
+
+    // Check base method is available
+    if (oic.outer(ois).getVal() != 123)
+      throw new RuntimeException("Wrong value calling outer");
+
+    // Check non-derived class using base class
+    if (oic.innerc().outer(ois).getVal() != 123)
+      throw new RuntimeException("Wrong value calling innerc");
+
+  }
+}

Examples/test-suite/java/preproc_line_file_runme.java

@@ -63,7 +63,7 @@ public class preproc_line_file_runme {
     if (SillyMacroClass.LINE_NUM != 56)
       throw new RuntimeException("preproc failure");
 
-    if (SillyMultipleMacroStruct.LINE_NUM != 81)
+    if (SillyMulMacroStruc.LINE_NUM != 81)
       throw new RuntimeException("preproc failure");
 
     if (preproc_line_file.INLINE_LINE != 87)

Examples/test-suite/java/smart_pointer_const_overload_runme.java

@@ -41,7 +41,7 @@ public class smart_pointer_const_overload_runme {
     Assert(f.getAccess() == MUTABLE_ACCESS);
       
     // Test static method
-    b.stat();
+    b.statMethod();
 
     Assert(f.getAccess() == CONST_ACCESS);
 

Examples/test-suite/java/template_default_class_parms_runme.java

@@ -45,6 +45,11 @@ public class template_default_class_parms_runme {
       foo.setTType(a);
       a = foo.method(a);
     }
+
+    {
+      MapDefaults md = new MapDefaults();
+      md.test_func(10, 20, new DefaultNodeType());
+    }
   }
 }