Merge branch 'master' into travis-osx

* master:
  Test case warning suppression for visual c++
  Cosmetic corrections - Mac OS X
  testcase warning fix
  HTML fix in docs
  Tweak configure output for Java
  Don't check for all the languages in Travis language-specific builds.
  Skip check for pep8 if Python is disabled in configure.
  Make configure --without-alllang option actually useful.
  Cosmetic: fix wrong configure options indentation in --help.
  Don't duplicate Java headers path under OS X in configure.
  Fix potential security exploit in generated Java classes
  SWIG_LIB fix for out of source MinGW builds
  Move MinGW mixed path conversion code to the pathconvert tool
  Use JAVA_HOME value in configure to detect Java.
  Improve configure output when python is not installed
  Remove executable permission from appveyor.yml.
  Ocaml configure changes
  Consistent memory initialization in php typemaps.
  Initialise all newly created arrays in arrays.i library.
  Consistent memory intiailization between C and C++ in typemaps
  Restored broken ignoring of operators etc. Added more comments.
  Improve python code indentation warning / error messages
  Function comment header formatting corrections
  Improve Python docstring indentation handling
  Avoid gcc uninitialized variable warnings in Python wrappers.
  Typemap attribute fixes
  Add documentation and CHANGES for special variables and typemap attributes.
  Support special variable expansion in special variable macros in typemap attributes.
  Enable variable and typemap substitution in typemap kwargs, and a test that verifies this works for directorin:descriptor.
  refactoring: 2 ways of ignoring symbol in add_symbols() merged for clarity
  explicitly %ignore'd symbol does not get feature:ignore if it is only added to C symbol table
  Remove callback function from autodoc unit test.
  Octave 4.0 fails in Travis
  Make callback unit test pass for PHP backend.
  Add changes note for Python tp_doc slot and docstring
  Clearer variable name in Java director generated code
  warning fixes
  String / char * usage in parser fixes
  const char * fixes in the parser
  Update CHANGES.current and Octave.html to indicate Octave 4.0.0 support
  Octave: use correct mkoctfile executable
  Add octave 4.0 to travis
  Fix compile flags for Travis C++11 testing
  Travis testing c++11 and gcc5
  c++11 test case fixes
  Fix default_constructor_runme.m test
  Add #include <climits> for INT_MAX
  Update print() signature for octave 4.0
  Set class docstring in tp_doc slot for python -builtin
  Travis testing extended to test c++11 and c++14 with gcc-5
  Configuring C++11 compiler flags for testing fix
  Support for octave 4.0.0
  Don't generate constructor wrappers if a base class has a private constructor
  Test-suite fixes for c++11 compilation by g++-5.1
  Fix incorrect test case code
  Set OCAMLC to empty if Ocaml compiler not found
  Bump version to 3.0.7
  Unused method warning suppression for Javascript v8
  Add 3.0.6 release notes and release date
  Html doc fixes
  Testcase workaround for Solaris
  parent_class testcase name warning fixes for PHP
  Use "mixed" path to source directory under Cygwin.

1 files changed, 3 insertions, 3 deletions

diff --git a/Lib/java/boost_shared_ptr.i b/Lib/java/boost_shared_ptr.i
index e75236993..136570da5 100644
--- a/Lib/java/boost_shared_ptr.i
+++ b/Lib/java/boost_shared_ptr.i
@@ -145,8 +145,8 @@
 
 // Base proxy classes
 %typemap(javabody) TYPE %{
-  private long swigCPtr;
-  private boolean swigCMemOwn;
+  private transient long swigCPtr;
+  private transient boolean swigCMemOwn;
 
   PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) {
     swigCMemOwn = cMemoryOwn;
@@ -160,7 +160,7 @@
 
 // Derived proxy classes
 %typemap(javabody_derived) TYPE %{
-  private long swigCPtr;
+  private transient long swigCPtr;
   private boolean swigCMemOwnDerived;
 
   PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) {