Ignore:
Timestamp:
04/16/12 14:57:18 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 11994M

Location:
issm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/src/c/objects/Params/DoubleParam.cpp

    r11237 r11995  
    133133/*FUNCTION DoubleParam::GetParameterValue(int* pinteger){{{1*/
    134134void DoubleParam::GetParameterValue(int* pinteger){
    135 #ifdef _SERIAL_
     135#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
    136136        *pinteger=(int)value;
    137137#else
    … …  
    142142/*FUNCTION DoubleParam::GetParameterValue(bool* pbool){{{1*/
    143143void DoubleParam::GetParameterValue(bool* pbool){
    144 #ifdef _SERIAL_
     144#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
    145145
    146146        /*If debugging mode, cheeck that the double is 0 or 1*/
    … …  
    155155/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM){{{1*/
    156156void DoubleParam::GetParameterValue(int** pintarray,int* pM){
    157 #ifdef _SERIAL_
     157#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
    158158        int* output=NULL;
    159159
    … …  
    171171/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{1*/
    172172void DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){
    173 #ifdef _SERIAL_
     173#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
    174174        int* output=NULL;
    175175
    … …  
    188188/*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/
    189189void DoubleParam::GetParameterValue(double** pdoublearray,int* pM){
    190 #ifdef _SERIAL_
     190#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
    191191        double* output=NULL;
    192192
    … …  
    204204/*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{1*/
    205205void DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){
    206 #ifdef _SERIAL_
     206#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
    207207        double* output=NULL;
    208208
    … …  
    220220/*}}}*/
    221221/*FUNCTION DoubleParam::SetMatlabField{{{1*/
    222 #ifdef _SERIAL_
     222#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
    223223void  DoubleParam::SetMatlabField(mxArray* dataref){
    224224
Note: See TracChangeset for help on using the changeset viewer.