Ignore:
Timestamp:
07/24/12 10:36:19 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 12703

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r12330 r12706  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*FileParam constructors and destructor*/
    23 /*FUNCTION FileParam::FileParam(){{{1*/
     23/*FUNCTION FileParam::FileParam(){{{*/
    2424FileParam::FileParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION FileParam::FileParam(int enum_type,FILE *value){{{1*/
     28/*FUNCTION FileParam::FileParam(int enum_type,FILE *value){{{*/
    2929FileParam::FileParam(int in_enum_type,FILE* in_value){
    3030
    … …  
    3333}
    3434/*}}}*/
    35 /*FUNCTION FileParam::~FileParam(){{{1*/
     35/*FUNCTION FileParam::~FileParam(){{{*/
    3636FileParam::~FileParam(){
    3737        return;
    … …  
    4040
    4141/*Object virtual functions definitions:*/
    42 /*FUNCTION FileParam::Echo {{{1*/
     42/*FUNCTION FileParam::Echo {{{*/
    4343void FileParam::Echo(void){
    4444        this->DeepEcho();
    4545}
    4646/*}}}*/
    47 /*FUNCTION FileParam::DeepEcho{{{1*/
     47/*FUNCTION FileParam::DeepEcho{{{*/
    4848void FileParam::DeepEcho(void){
    4949
    50         printf("FileParam:\n");
    51         printf("   enum:  %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
    52         printf("   value: %p\n",this->value);
     50        _printLine_("FileParam:");
     51        _printLine_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
     52        _printLine_("   value: " << this->value);
    5353}
    5454/*}}}*/
    55 /*FUNCTION FileParam::Id{{{1*/
     55/*FUNCTION FileParam::Id{{{*/
    5656int    FileParam::Id(void){ return -1; }
    5757/*}}}*/
    58 /*FUNCTION FileParam::MyRank{{{1*/
     58/*FUNCTION FileParam::MyRank{{{*/
    5959int    FileParam::MyRank(void){
    6060        extern int my_rank;
    … …  
    6262}
    6363/*}}}*/
    64 /*FUNCTION FileParam::ObjectEnum{{{1*/
     64/*FUNCTION FileParam::ObjectEnum{{{*/
    6565int FileParam::ObjectEnum(void){
    6666
    … …  
    6969}
    7070/*}}}*/
    71 /*FUNCTION FileParam::copy{{{1*/
     71/*FUNCTION FileParam::copy{{{*/
    7272Object* FileParam::copy() {
    7373       
    … …  
    7878
    7979/*FileParam virtual functions definitions: */
    80 /*FUNCTION FileParam::GetParameterName{{{1*/
     80/*FUNCTION FileParam::GetParameterName{{{*/
    8181void FileParam::GetParameterName(char**pname){
    8282        EnumToStringx(pname,this->enum_type);
    8383}
    8484/*}}}*/
    85 /*FUNCTION FileParam::UnitConversion{{{1*/
     85/*FUNCTION FileParam::UnitConversion{{{*/
    8686void  FileParam::UnitConversion(int direction_enum){
    8787        /*do nothing, no unit conversion*/
Note: See TracChangeset for help on using the changeset viewer.