Changeset 14932

Timestamp:

05/06/13 15:02:49 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: need to use std::string

Location:

issm/trunk-jpl/src/c

Files:

• classes/dakota/DakotaPlugin.cpp (modified) (1 diff)
• modules/Scotchx/Scotchx.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp

@@ -71 +71 @@
         variable_descriptors=xNew<char*>(numACV);
         for(i=0;i<numACV;i++){
-                string label=xCLabels[i];
+                std::string label=xCLabels[i];
                 variable_descriptor=xNew<char>(strlen(label.c_str())+1);
                 memcpy(variable_descriptor,label.c_str(),(strlen(label.c_str())+1)*sizeof(char));

issm/trunk-jpl/src/c/modules/Scotchx/Scotchx.h

@@ -17 +17 @@
 #include <stdio.h>
 #include <string.h>
-
 #include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"