From e53f1488a7455339e57e4b20620f88d155323647 Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Mon, 7 Apr 2014 17:10:52 +0200
Subject: [PATCH] scilab: fix li_std_string test regression

---
 Lib/scilab/sciexception.swg | 5 +----
 Lib/scilab/scirun.swg       | 6 +++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Lib/scilab/sciexception.swg b/Lib/scilab/sciexception.swg
index d9a8fbeb9..206725596 100644
--- a/Lib/scilab/sciexception.swg
+++ b/Lib/scilab/sciexception.swg
@@ -46,14 +46,11 @@
   %raise(obj, "$type", $descriptor);
 }
 
-
-
-
 %typemap(throws, noblock=1) SWIGTYPE,
                             SWIGTYPE*,
                             SWIGTYPE [ANY],
                             SWIGTYPE & {
-  %raise(NULL, "$type", $descriptor);
+  %raise((char*)NULL, "$type", $descriptor);
 }
 
 %typemap(throws, noblock=1) (...) {
diff --git a/Lib/scilab/scirun.swg b/Lib/scilab/scirun.swg
index 25e43f424..ef27390c6 100644
--- a/Lib/scilab/scirun.swg
+++ b/Lib/scilab/scirun.swg
@@ -234,7 +234,6 @@ SWIG_Scilab_ErrorMsg(int code, const char *msg)
 
 #define SWIG_fail return SWIG_ERROR;
 
-
 SWIGRUNTIME int
 SwigScilabRaise(const char *obj, const char *type, swig_type_info *descriptor) {
   if (type) {
@@ -245,6 +244,11 @@ SwigScilabRaise(const char *obj, const char *type, swig_type_info *descriptor) {
   }
 }
 
+SWIGRUNTIME int
+SwigScilabRaise(const int obj, const char *type, swig_type_info *descriptor) {
+  Scierror(999, "Exception (%s) occured.\n", type);
+}
+
 #define SWIG_Scilab_Raise(obj, type, descriptor) SwigScilabRaise(obj, type, descriptor)
 
 /*