Changeset 348 for cpp/frams/genetics/fF

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

Location:

cpp/frams/genetics/fF

Files:

• conv_fF.cpp (modified) (1 diff)
• fF_genotype.h (modified) (1 diff)

cpp/frams/genetics/fF/conv_fF.cpp

@@ -39 +39 @@
 {
         fF_growth_params gp;
-        if (!gp.load(in)) //invalid input genotype?
+        if (!gp.load(in.c_str())) //invalid input genotype?
                 return ""; //so we return an invalid f0 genotype
 

cpp/frams/genetics/fF/fF_genotype.h

@@ -43 +43 @@
                 SString tmp;
                 param.save2(tmp, NULL/*object containing default values for comparison*/, false/*add CR*/, false/*force field names*/);
-                return string((const char*)tmp);
+                return string(tmp.c_str());
         }
 };