From 2535e9ae2f951ea00e3fd010bab1a34dd9dd6a90 Mon Sep 17 00:00:00 2001 From: Vincent Couvert Date: Thu, 26 May 2011 09:15:08 +0000 Subject: [PATCH] Rename function: SwigScilabDoubleFromDouble -> SWIG_SciDouble_FromDouble git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@12718 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/scilab/scidouble.swg | 16 ++++++++-------- Lib/scilab/scifloat.swg | 4 ++-- Lib/scilab/sciint.swg | 4 ++-- Lib/scilab/scilong.swg | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Lib/scilab/scidouble.swg b/Lib/scilab/scidouble.swg index 11d0f97ea..559f81da9 100644 --- a/Lib/scilab/scidouble.swg +++ b/Lib/scilab/scidouble.swg @@ -1,16 +1,16 @@ /* * DOUBLE SCALAR */ -%fragment(SWIG_AsVal_frag(double), "header", fragment="SwigScilabDoubleToDouble") { -#define SWIG_AsVal_double(scilabValue, valuePointer) SwigScilabDoubleToDouble(pvApiCtx, scilabValue, valuePointer, fname) +%fragment(SWIG_AsVal_frag(double), "header", fragment="SWIG_SciDouble_AsDouble") { +#define SWIG_AsVal_double(scilabValue, valuePointer) SWIG_SciDouble_AsDouble(pvApiCtx, scilabValue, valuePointer, fname) } -%fragment(SWIG_From_frag(double), "header", fragment="SwigScilabDoubleFromDouble") { -#define SWIG_From_double(value) SwigScilabDoubleFromDouble(pvApiCtx, $result, value) +%fragment(SWIG_From_frag(double), "header", fragment="SWIG_SciDouble_FromDouble") { +#define SWIG_From_double(value) SWIG_SciDouble_FromDouble(pvApiCtx, $result, value) } -%fragment("SwigScilabDoubleToDouble", "header") { +%fragment("SWIG_SciDouble_AsDouble", "header") { SWIGINTERN int -SwigScilabDoubleToDouble(void *_pvApiCtx, int _iVar, double *_pdblValue, char *_fname) { +SWIG_SciDouble_AsDouble(void *_pvApiCtx, int _iVar, double *_pdblValue, char *_fname) { SciErr sciErr; int iRet = 0; int *piAddrVar = NULL; @@ -40,9 +40,9 @@ SwigScilabDoubleToDouble(void *_pvApiCtx, int _iVar, double *_pdblValue, char *_ } } -%fragment("SwigScilabDoubleFromDouble", "header") { +%fragment("SWIG_SciDouble_FromDouble", "header") { SWIGINTERN int -SwigScilabDoubleFromDouble(void *_pvApiCtx, int _iVarOut, double _dblValue) { +SWIG_SciDouble_FromDouble(void *_pvApiCtx, int _iVarOut, double _dblValue) { int iRet; iRet = createScalarDouble(_pvApiCtx, Rhs + _iVarOut, _dblValue); diff --git a/Lib/scilab/scifloat.swg b/Lib/scilab/scifloat.swg index 33d8565be..62b6696af 100644 --- a/Lib/scilab/scifloat.swg +++ b/Lib/scilab/scifloat.swg @@ -9,11 +9,11 @@ #define SWIG_From_float(value) SwigScilabDoubleFromFloat(pvApiCtx, $result, value) } -%fragment("SwigScilabDoubleToFloat", "header", fragment="SwigScilabDoubleToDouble") { +%fragment("SwigScilabDoubleToFloat", "header", fragment="SWIG_SciDouble_AsDouble") { SWIGINTERN int SwigScilabDoubleToFloat(void *_pvApiCtx, int _iVar, float *_pfValue, char *_fname) { double dblValue = 0.0; - if(SwigScilabDoubleToDouble(_pvApiCtx, _iVar, &dblValue, _fname) != SWIG_OK) { + if(SWIG_SciDouble_AsDouble(_pvApiCtx, _iVar, &dblValue, _fname) != SWIG_OK) { return SWIG_ERROR; } *_pfValue = (float) dblValue; diff --git a/Lib/scilab/sciint.swg b/Lib/scilab/sciint.swg index 6eca61866..186ed7f7d 100644 --- a/Lib/scilab/sciint.swg +++ b/Lib/scilab/sciint.swg @@ -8,11 +8,11 @@ %fragment(SWIG_AsVal_frag(size_t), "header", fragment="SWIG_SciDouble_AsInt") { #define SWIG_AsVal_size_t(scilabValue, valuePointer) SWIG_SciDouble_AsInt(pvApiCtx, scilabValue, (int*)valuePointer, fname) } -%fragment("SWIG_SciDouble_AsInt", "header", fragment="SwigScilabDoubleToDouble") { +%fragment("SWIG_SciDouble_AsInt", "header", fragment="SWIG_SciDouble_AsDouble") { SWIGINTERN int SWIG_SciDouble_AsInt(void *_pvApiCtx, int _iVar, int *_piValue, char *_fname) { double dblValue = 0.0; - if(SwigScilabDoubleToDouble(_pvApiCtx, _iVar, &dblValue, _fname) != SWIG_OK) { + if(SWIG_SciDouble_AsDouble(_pvApiCtx, _iVar, &dblValue, _fname) != SWIG_OK) { return SWIG_ERROR; } *_piValue = (int) dblValue; diff --git a/Lib/scilab/scilong.swg b/Lib/scilab/scilong.swg index c4b5aca92..f8017352b 100644 --- a/Lib/scilab/scilong.swg +++ b/Lib/scilab/scilong.swg @@ -22,11 +22,11 @@ #define SWIG_From_unsigned_SS_long(value) SwigScilabDoubleFromUnsignedLong(pvApiCtx, $result, value) } -%fragment("SwigScilabDoubleToLong", "header", fragment="SwigScilabDoubleToDouble") { +%fragment("SwigScilabDoubleToLong", "header", fragment="SWIG_SciDouble_AsDouble") { SWIGINTERN int SwigScilabDoubleToLong(void *_pvApiCtx, int _iVar, long *_plValue, char *_fname) { double dblValue = 0.0; - if(SwigScilabDoubleToDouble(_pvApiCtx, _iVar, &dblValue, _fname) != SWIG_OK) { + if(SWIG_SciDouble_AsDouble(_pvApiCtx, _iVar, &dblValue, _fname) != SWIG_OK) { return SWIG_ERROR; } *_plValue = (long) dblValue; @@ -34,11 +34,11 @@ SwigScilabDoubleToLong(void *_pvApiCtx, int _iVar, long *_plValue, char *_fname) } } -%fragment("SwigScilabDoubleToUnsignedLong", "header", fragment="SwigScilabDoubleToDouble") { +%fragment("SwigScilabDoubleToUnsignedLong", "header", fragment="SWIG_SciDouble_AsDouble") { SWIGINTERN int SwigScilabDoubleToUnsignedLong(void *_pvApiCtx, int _iVar, unsigned long *_pulValue, char *_fname) { double dblValue = 0.0; - if(SwigScilabDoubleToDouble(_pvApiCtx, _iVar, &dblValue, _fname) != SWIG_OK) { + if(SWIG_SciDouble_AsDouble(_pvApiCtx, _iVar, &dblValue, _fname) != SWIG_OK) { return SWIG_ERROR; } *_pulValue = (unsigned long) dblValue;