Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/modules/OutputResultsx/OutputResultsx.cpp

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/OutputResultsx/OutputResultsx.cpp (modified) (3 diffs)

issm/branches/trunk-jpl-damage/src/c/modules/OutputResultsx/OutputResultsx.cpp

@@ -14 +14 @@
 #include "../../Container/Container.h"
 #include "../../io/io.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
                 
-void OutputResultsx(                    Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results* results){
+void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results* results){
 
         extern int  my_rank;
@@ -46 +46 @@
                 EnumToStringx(&solutiontypestring,solutiontype);
                 results->AddObject(new StringExternalResult(results->Size()+1,SolutionTypeEnum,solutiontypestring,1,0));
-                xfree((void**)&solutiontypestring);
+                xDelete<char>(solutiontypestring);
         }
 
@@ -68 +68 @@
                         fid=pfopen(cpu_outputfilename ,"wb");
                 }
-                xfree((void**)&outputfilename);
+                xDelete<char>(outputfilename);
                 
                 /*Add file pointer in parameters for further calls to OutputResultsx: */