Changeset 205 for cpp/frams

Timestamp:

04/02/14 16:19:03 (11 years ago)

Author:

Maciej Komosinski

Message:

Easier way to get an invalid ExtValue?

Location:

cpp/frams

Files:

• Makefile-GDK-files (modified) (1 diff)
• util/extvalue.cpp (modified) (2 diffs)
• util/extvalue.h (modified) (1 diff)

cpp/frams/Makefile-GDK-files

@@ -14 +14 @@
 CONVFF=frams/genetics/fF/conv_fF.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o
 
-GENOCONV_GDK_OBJS=frams/genetics/defgenoconv.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF)
+GENOCONV_GDK_OBJS=frams/genetics/defgenoconv.o frams/vm/classes/genoobj.o frams/model/autoname.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF)
 GENMAN_GDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF4) $(GENMANF9) $(GENMANFF) $(GENMANFT)
 
-GENMAN_COMMON_OBJS=frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o frams/vm/classes/genoobj.o frams/model/autoname.o
+GENMAN_COMMON_OBJS=frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o
 
 GDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/framsg.o common/stl-util.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o frams/errmgr/errmanager.o frams/param/paramobj.o frams/genetics/oper_fx.o common/nonstd_math.o frams/errmgr/stderrors.o common/Convert.o frams/util/rndutil.o

cpp/frams/util/extvalue.cpp

@@ -9 +9 @@
 #include <frams/vm/classes/collectionobj.h>
 #include <frams/vm/classes/3dobject.h>
+#include <frams/vm/classes/genoobj.h>
 #include <common/nonstd_math.h>
 #include <common/Convert.h>
@@ -711 +712 @@
 deserializable_classes+=&Pt3D_Ext::getStaticParam();
 deserializable_classes+=&Orient_Ext::getStaticParam();
+deserializable_classes+=&GenoObj::getStaticParam();
 }
 

cpp/frams/util/extvalue.h

@@ -127 +127 @@
 ExtValue(const SString &v) {sets(v);}
 ExtValue(const ExtObject &srco) {seto(srco);}
+static ExtValue invalid() {ExtValue v; v.setInvalid(); return v;}
 long compare(const ExtValue& src) const;
 int operator==(const ExtValue& src) const;