Changeset 12706 for issm/trunk/src/c/objects/Options/Option.cpp
- Timestamp:
- 07/24/12 10:36:19 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Options/Option.cpp
r9761 r12706 4 4 5 5 /*Headers:*/ 6 /*{{{ 1*/6 /*{{{*/ 7 7 #ifdef HAVE_CONFIG_H 8 8 #include <config.h> … … 21 21 22 22 /*Constructors/destructor/copy*/ 23 /*FUNCTION Option::Option(){{{ 1*/23 /*FUNCTION Option::Option(){{{*/ 24 24 Option::Option(){ 25 25 … … 31 31 } 32 32 /*}}}*/ 33 /*FUNCTION Option::~Option(){{{ 1*/33 /*FUNCTION Option::~Option(){{{*/ 34 34 Option::~Option(){ 35 35 36 if(size) x free((void**)&size);37 if(name) x free((void**)&name);36 if(size) xDelete<int>(size); 37 if(name) xDelete<char>(name); 38 38 39 39 } … … 41 41 42 42 /*Other*/ 43 /*FUNCTION Option::Echo {{{ 1*/43 /*FUNCTION Option::Echo {{{*/ 44 44 void Option::Echo(){ 45 45 … … 47 47 bool flag=true; 48 48 49 _printf_(flag," name: \"%s\"\n" ,name);50 _printf_(flag," numel: %d\n" ,numel);51 _printf_(flag," ndims: %d\n" ,ndims);49 if(flag) _pprintLine_(" name: \"" << name << "\""); 50 if(flag) _pprintLine_(" numel: " << numel); 51 if(flag) _pprintLine_(" ndims: " << ndims); 52 52 if(size){ 53 53 StringFromSize(cstr,size,ndims); 54 _printf_(flag," size: %s\n" ,cstr);54 if(flag) _pprintLine_(" size: " << cstr); 55 55 } 56 else _printf_(flag," size: [empty]\n");56 else if(flag) _pprintLine_(" size: [empty]"); 57 57 } 58 58 /*}}}*/ 59 /*FUNCTION Option::DeepEcho() {{{ 1*/59 /*FUNCTION Option::DeepEcho() {{{*/ 60 60 void Option::DeepEcho(){ 61 61 … … 67 67 } 68 68 /*}}}*/ 69 /*FUNCTION Option::DeepEcho(char* indent) {{{ 1*/69 /*FUNCTION Option::DeepEcho(char* indent) {{{*/ 70 70 void Option::DeepEcho(char* indent){ 71 71 … … 73 73 bool flag=true; 74 74 75 _printf_(flag,"%s name: \"%s\"\n" ,indent,name);76 _printf_(flag,"%s numel: %d\n" ,indent,numel);77 _printf_(flag,"%s ndims: %d\n" ,indent,ndims);75 if(flag) _pprintLine_(indent << " name: \"" << name << "\""); 76 if(flag) _pprintLine_(indent << " numel: " << numel); 77 if(flag) _pprintLine_(indent << " ndims: " << ndims); 78 78 if(size){ 79 79 StringFromSize(cstr,size,ndims); 80 _printf_(flag,"%s size: %s\n" ,indent,cstr);80 if(flag) _pprintLine_(indent << " size: " << cstr); 81 81 } 82 else _printf_(flag,"%s size: [empty]\n" ,indent);82 else if(flag) _pprintLine_(indent << " size: [empty]"); 83 83 } 84 84 /*}}}*/ 85 /*FUNCTION Option::Name {{{ 1*/85 /*FUNCTION Option::Name {{{*/ 86 86 char* Option::Name(){ 87 87 … … 89 89 } 90 90 /*}}}*/ 91 /*FUNCTION Option::NumEl {{{ 1*/91 /*FUNCTION Option::NumEl {{{*/ 92 92 int Option::NumEl(){ 93 93 … … 95 95 } 96 96 /*}}}*/ 97 /*FUNCTION Option::NDims {{{ 1*/97 /*FUNCTION Option::NDims {{{*/ 98 98 int Option::NDims(){ 99 99 … … 101 101 } 102 102 /*}}}*/ 103 /*FUNCTION Option::Size {{{ 1*/103 /*FUNCTION Option::Size {{{*/ 104 104 int* Option::Size(){ 105 105 … … 107 107 } 108 108 /*}}}*/ 109 /*FUNCTION Option::Get {{{ 1*/109 /*FUNCTION Option::Get {{{*/ 110 110 //void* Option::Get(){ 111 111
Note:
See TracChangeset
for help on using the changeset viewer.