Changeset 348 for cpp/frams/param/mutableparam.cpp

Timestamp:

04/09/15 23:51:28 (9 years ago)

Author:

Maciej Komosinski

Message:

• explicit c_str() in SString instead of (const char*) cast
• genetic converters and GenMan? are now thread-local which enables multi-threaded simulator separation

File:

• cpp/frams/param/mutableparam.cpp (modified) (3 diffs)

cpp/frams/param/mutableparam.cpp

@@ -33 +33 @@
         if (ignoreprefix)
                 {
-      const char *noprefix=(const char*)groupname(i);
+      const char *noprefix=groupname(i).c_str();
       if ((int)strlen(noprefix) < skipprefix) continue;
                 noprefix+=skipprefix;
-                if (!strcmp(noprefix,(const char*)name)) return i;
+                if (!strcmp(noprefix,name.c_str())) return i;
                 }
                 else
@@ -183 +183 @@
 void MutableParam::p_addprop(ExtValue *args,ExtValue *ret)
 {
-int i=addProperty(0,args[2].getString(),args[1].getString(),args[0].getString());
+int i=addProperty(0,args[2].getString().c_str(),args[1].getString().c_str(),args[0].getString().c_str());
 ret->setInt(i);
 }
@@ -284 +284 @@
         {
         SString *n=(SString*)store(i);
-        int prop=p.findId((const char*)*n);
+        int prop=p.findId(n->c_str());
         if (prop<0)
-                prop=p.addProperty(0,(const char*)*n,"x",0,0,0,0,-1);
+                prop=p.addProperty(0,n->c_str(),"x",0,0,0,0,-1);
         p.setExtValue(prop,*(ExtValue*)store(i+1));
         }