Ignore:
Timestamp:
01/25/12 10:52:04 (13 years ago)
Author:
Mathieu Morlighem
Message:

Fixed some g++ warnings: deprecated conversion from string constant to ‘char*’

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp

    r9883 r11202  
    150150        int     type;
    151151        int     size;
    152         char   *name    = NULL;
    153152        double  boolean;
    154153        extern  int my_rank;
     154        char*   name = NULL;
    155155
    156156        /*return if now on cpu 0: */
     
    158158
    159159        /*First write enum: */
    160         name=EnumToStringx(this->enum_type);
     160        EnumToStringx(&name,this->enum_type);
    161161        length=(strlen(name)+1)*sizeof(char);
    162162        fwrite(&length,sizeof(int),1,fid);
     
    180180/*}}}1*/
    181181/*FUNCTION BoolExternalResult::GetResultName{{{1*/
    182 char* BoolExternalResult::GetResultName(void){
    183         return  EnumToStringx(this->enum_type);
     182void BoolExternalResult::GetResultName(char** pname){
     183        EnumToStringx(pname,this->enum_type);
    184184}
    185185/*}}}*/
     
    189189
    190190        char* name=NULL;
    191         name=this->GetResultName();
     191        this->GetResultName(&name);
    192192       
    193193        mxSetField( dataref, this->step-1, name,mxCreateDoubleScalar((double)value));
Note: See TracChangeset for help on using the changeset viewer.