Changeset 18301 for issm/trunk/src/c/classes/Params/IntMatParam.cpp

Timestamp:

07/30/14 14:22:43 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 18299

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/Params/IntMatParam.cpp (modified) (8 diffs)

issm/trunk/src/c/classes/Params/IntMatParam.cpp

@@ -16 +16 @@
 
 /*IntMatParam constructors and destructor*/
-/*FUNCTION IntMatParam::IntMatParam(){{{*/
-IntMatParam::IntMatParam(){
+IntMatParam::IntMatParam(){/*{{{*/
         return;
 }
 /*}}}*/
-/*FUNCTION IntMatParam::IntMatParam(int enum_type,IssmIntMat value){{{*/
-IntMatParam::IntMatParam(int in_enum_type,int* in_value, int in_M,int in_N){
+IntMatParam::IntMatParam(int in_enum_type,int* in_value, int in_M,int in_N){/*{{{*/
 
         enum_type=in_enum_type;
@@ -32 +30 @@
 }
 /*}}}*/
-/*FUNCTION IntMatParam::~IntMatParam(){{{*/
-IntMatParam::~IntMatParam(){
+IntMatParam::~IntMatParam(){/*{{{*/
         xDelete<int>(value);
         return;
@@ -40 +37 @@
 
 /*Object virtual functions definitions:*/
-/*FUNCTION IntMatParam::Echo {{{*/
-void IntMatParam::Echo(void){
+void IntMatParam::Echo(void){/*{{{*/
 
         _printf_("IntMatParam:\n");
@@ -49 +45 @@
 }
 /*}}}*/
-/*FUNCTION IntMatParam::DeepEcho{{{*/
-void IntMatParam::DeepEcho(void){
+void IntMatParam::DeepEcho(void){/*{{{*/
 
         int i,j;
@@ -64 +59 @@
 }
 /*}}}*/
-/*FUNCTION IntMatParam::Id{{{*/
-int    IntMatParam::Id(void){ return -1; }
+int    IntMatParam::Id(void){ return -1; }/*{{{*/
 /*}}}*/
-/*FUNCTION IntMatParam::ObjectEnum{{{*/
-int IntMatParam::ObjectEnum(void){
+int IntMatParam::ObjectEnum(void){/*{{{*/
 
         return IntMatParamEnum;
@@ -74 +67 @@
 }
 /*}}}*/
-/*FUNCTION IntMatParam::copy{{{*/
-Object* IntMatParam::copy() {
+Object* IntMatParam::copy() {/*{{{*/
 
         return new IntMatParam(this->enum_type,this->value,this->M,this->N);
@@ -83 +75 @@
 
 /*IntMatParam virtual functions definitions: */
-/*FUNCTION IntMatParam::GetParameterValue{{{*/
-void  IntMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){
+void  IntMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){/*{{{*/
         int* output=NULL;
 
@@ -96 +87 @@
 }
 /*}}}*/
-/*FUNCTION IntMatParam::SetValue{{{*/
-void  IntMatParam::SetValue(int* intarray,int in_M,int in_N){
+void  IntMatParam::SetValue(int* intarray,int in_M,int in_N){/*{{{*/
 
         /*avoid leak: */