From: Antoine ELIAS <antoine.elias@scilab-enterprises.com>
Date: Tue, 2 Sep 2014 15:42:42 +0000 (+0200)
Subject: fix template mismatching
X-Git-Tag: 6.0.0-alpha-1~1162
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=412fb9eddfb63449282979a1eaeda7676d2ebbff

fix template mismatching

Change-Id: I9c785f870ee95a9caa62e084cb7cd585b1905901
---

diff --git a/scilab/modules/ast/includes/operations/types_subtraction.hxx b/scilab/modules/ast/includes/operations/types_subtraction.hxx
index 88c8ad0..d1b4df4 100644
--- a/scilab/modules/ast/includes/operations/types_subtraction.hxx
+++ b/scilab/modules/ast/includes/operations/types_subtraction.hxx
@@ -257,7 +257,7 @@ template<typename T, typename O> inline static void sub(T l, O* o)
 }
 
 //x1c - []
-template<typename T, typename O> inline static void sub(T l, T lc, O* o, O* oc)
+template<typename T, typename O> inline static void sub(T l, T lc, size_t /*size*/, O* o, O* oc)
 {
     *o = (O)l;
     *oc = (O)lc;
diff --git a/scilab/modules/ast/src/cpp/operations/types_subtraction.cpp b/scilab/modules/ast/src/cpp/operations/types_subtraction.cpp
index 6c267c0..06a07db 100644
--- a/scilab/modules/ast/src/cpp/operations/types_subtraction.cpp
+++ b/scilab/modules/ast/src/cpp/operations/types_subtraction.cpp
@@ -1055,7 +1055,7 @@ template<class T, class U, class O>
 InternalType* sub_SC_E(T *_pL, U *_pR)
 {
     O* pOut = new O(0.0, 0.0);
-    sub(_pL->get(0), _pL->getImg(0), pOut->get(), pOut->getImg());
+    sub(_pL->get(0), _pL->getImg(0), (size_t)1, pOut->get(), pOut->getImg());
     return pOut;
 }