Merge branch 'master' into travis-osx

* master:
  Perl5 carrays testcase fix
  Appveyor testing expanded
  Fix array overrun in li_carrays testcase
  Correct testcase use of typename to be inside a template II
  suppress warning for ExternalReference print
  Warning fixes in generated Python code for 64bit Visual C++ on Windows.
  Warning fixes in generated C# code for 64bit Visual C++ on Windows.
  Warning fixes for 64bit visual c++ on Windows
  Warning fixes in generated Java code for 64bit Visual C++ on Windows.
  Warning fixes for 64bit visual c++ on Windows
  C# gc tests failure fix
  Correct testcase use of typename to be inside a template
  Add a space between literal and string macro
  Fix syntax error when the template keyword is used in types
  Add CHANGES.current entry for PR #452
  lua: push characters as unformatted 1-character strings
  Fix or workaround PEP8 warnings
  Document use of %pythoncode "file.py"
  Improve handling of whitespace in %pythoncode
  Drop removal of libtool on "make distclean"
  Appveyor: use default os image
  simplify SWIG_SciString_AsChar()
  improve support of varargs
  scilab: use freeAllocatedSingleString() after getAllocatedSingleTree()
  scilab: fix memory leak
  Cosmetic parser change
  Fix parse errors for C++11 type aliasing
  [Go] Fix member variables in base classes to handle CWRAP_NATURAL_VAR correctly.  Add a test case for the problem.
  [Go] Add Makefile testing support for changes in upcoming Go 1.5 release. No effect on the SWIG program itself.
  -external-runtime doc improvement
  Fix Python pep8 warning when using -fastinit (or -O)
  Fix python -builtin -O and overloaded functions
  Don't fail R in Travis - runtime tests are failing in this environment
  Fix r.cxx build break
  Add R to travis testing
  R - Remove constantWrapper message wrapping constants
  R - fix duplicate generation of 'self' parameter.
  R - Call to SWIG_createNewRef in copyToC was incorrectly named.
  Documentation improvements for -o and -oh options
  Expand section on code generation philosophy.
  Cosmetics - remove references to Java in C# module
  changes file update for -outfile
  Add in all C# command line options to the docs
  C# -outfile cosmetic code fixes
  Fix warning display of types associated with 'using' and templates.
  Fix C++11 type aliasing seg fault.
  [C#] Single file mode (fixes)
  [C#] Single file mode (minor fix)
  [C#] Single file mode
  Appveyor upgrade to cygwin on stable server

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c
index 0bfbb4bce..23b1e80e9 100644
--- a/Source/Swig/typemap.c
+++ b/Source/Swig/typemap.c
@@ -1844,7 +1844,7 @@ static List *split_embedded_typemap(String *s) {
       }
     }
     if ((level == 0) && angle_level == 0 && ((*c == ',') || (*c == ')'))) {
-      String *tmp = NewStringWithSize(start, c - start);
+      String *tmp = NewStringWithSize(start, (int)(c - start));
       Append(args, tmp);
       Delete(tmp);
       start = c + 1;
@@ -1915,10 +1915,10 @@ static void replace_embedded_typemap(String *s, ParmList *parm_sublist, Wrapper
       c++;
     }
     if (end) {
-      dollar_typemap = NewStringWithSize(start, (end - start));
+      dollar_typemap = NewStringWithSize(start, (int)((end - start)));
       syntax_error = 0;
     } else {
-      dollar_typemap = NewStringWithSize(start, (c - start));
+      dollar_typemap = NewStringWithSize(start, (int)((c - start)));
     }
 
     if (!syntax_error) {
@@ -1963,7 +1963,7 @@ static void replace_embedded_typemap(String *s, ParmList *parm_sublist, Wrapper
 	    char *eq = strchr(Char(parm), '=');
 	    char *c = Char(parm);
 	    if (eq && (eq - c > 0)) {
-	      String *name = NewStringWithSize(c, eq - c);
+	      String *name = NewStringWithSize(c, (int)(eq - c));
 	      String *value = NewString(eq + 1);
 	      Insert(name, 0, "$");
 	      Setattr(vars, name, value);