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

Timestamp:

04/09/15 23:51:28 (10 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/multiparamload.cpp (modified) (5 diffs)

cpp/frams/param/multiparamload.cpp

@@ -107 +107 @@
         else if (status==BeforeUnknown)
                 {
-                FMprintf("MultiParamLoader","go",FMLV_WARN,"Skipping object '%s'",(const char*)lastunknown);
+                FMprintf("MultiParamLoader","go",FMLV_WARN,"Skipping object '%s'",lastunknown.c_str());
                 loadObjectNow(&emptyparam,false);
                 continue;
@@ -126 +126 @@
                 if (buf.startsWith("#include"))
                         {
-                        const char* t=strchr((const char*)buf,'\"'),*t2=0;
+                        const char* t=strchr(buf.c_str(),'\"'),*t2=0;
                         if (t)
                                 t2=strchr(t+1,'\"');
@@ -137 +137 @@
                                 {
                                 const char* thisfilename=file->VgetPath();
-                                FMprintf("MultiParamLoader","go",FMLV_WARN,"invalid \"%s\"%s%s",(const char*)buf,
+                                FMprintf("MultiParamLoader","go",FMLV_WARN,"invalid \"%s\"%s%s",buf.c_str(),
                                          (thisfilename?" in ":""),(thisfilename?thisfilename:""));
                                 }
@@ -157 +157 @@
                 FOREACH(ExtObject*,o,objects)
                         {
-                        if (!strcmp(o->interfaceName(),lastunknown)) {lastobject=*o; break;}
+                        if (!strcmp(o->interfaceName(),lastunknown.c_str())) {lastobject=*o; break;}
                         }
                         if (!lastobject.isEmpty())
@@ -202 +202 @@
         newfilename=filename;
 
-if (alreadyIncluded(newfilename))
+if (alreadyIncluded(newfilename.c_str()))
         {
         FMprintf("MultiParamLoader","include",FMLV_WARN,"circular reference ignored (\"%s\")",
-                    (const char*)filename);
+                    filename.c_str());
         return;
         }
 
-VirtFILE *f=Vfopen(newfilename,FOPEN_READ_BINARY);
+VirtFILE *f=Vfopen(newfilename.c_str(),FOPEN_READ_BINARY);
 if (!f)
         {
-        FMprintf("MultiParamLoader","include",FMLV_WARN,"\"%s\" not found",(const char*)newfilename);
+        FMprintf("MultiParamLoader","include",FMLV_WARN,"\"%s\" not found",newfilename.c_str());
         }
 else