Changeset 988 for cpp/frams/vm

Timestamp:

07/09/20 00:13:20 (4 years ago)

Author:

Maciej Komosinski

Message:

Building a Model from Geno now fails when Model.shape is incompatible with Geno.format; renamed enum constants for genetic formats: xxx_FORMAT => FORMAT_xxx

File:

• cpp/frams/vm/classes/genoobj.cpp (modified) (2 diffs)

cpp/frams/vm/classes/genoobj.cpp

@@ -111 +111 @@
                 return v.getString();
         }
-        return Geno::INVALID_FORMAT;
+        return Geno::FORMAT_INVALID;
 }
 
@@ -198 +198 @@
                 SString n = vec->get(1) ? vec->get(1)->getString() : SString::empty();
                 SString c = vec->get(2) ? vec->get(2)->getString() : SString::empty();
-                *ret = makeDynamicObjectAndDecRef(new Geno(g, Geno::UNKNOWN_FORMAT, n, c));
+                *ret = makeDynamicObjectAndDecRef(new Geno(g, Geno::FORMAT_UNKNOWN, n, c));
         }
         else