Changeset 3567 for issm/trunk/src/c/objects/Sing.cpp

Timestamp:

04/19/10 09:49:52 (15 years ago)

Author:

Mathieu Morlighem

Message:

all enums are now C Enums, no need to provide a number: the numbering is done automatically

File:

• issm/trunk/src/c/objects/Sing.cpp (modified) (4 diffs)

issm/trunk/src/c/objects/Sing.cpp

@@ -193 +193 @@
 
         /*get enum type of Sing: */
-        enum_type=SingEnum();
+        enum_type=SingEnum;
         
         /*marshall enum: */
@@ -348 +348 @@
 
         /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */
-        if ((analysis_type==DiagnosticAnalysisEnum()) && (sub_analysis_type==HutterAnalysisEnum())){
+        if ((analysis_type==DiagnosticAnalysisEnum) && (sub_analysis_type==HutterAnalysisEnum)){
 
                 CreateKMatrixDiagnosticHutter( Kgg,inputs,analysis_type,sub_analysis_type);
@@ -385 +385 @@
         
         /*Just branch to the correct load generator, according to the type of analysis we are carrying out: */
-        if ((analysis_type==DiagnosticAnalysisEnum()) && (sub_analysis_type==HutterAnalysisEnum())){
+        if ((analysis_type==DiagnosticAnalysisEnum) && (sub_analysis_type==HutterAnalysisEnum)){
         
                         CreatePVectorDiagnosticHutter( pg,inputs,analysis_type,sub_analysis_type);
@@ -472 +472 @@
 int Sing::Enum(void){
 
-        return SingEnum();
+        return SingEnum;
 
 }