Changeset 205
- Timestamp:
- 04/02/14 16:19:03 (11 years ago)
- Location:
- cpp/frams
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/Makefile-GDK-files
r196 r205 14 14 CONVFF=frams/genetics/fF/conv_fF.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o 15 15 16 GENOCONV_GDK_OBJS=frams/genetics/defgenoconv.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF)16 GENOCONV_GDK_OBJS=frams/genetics/defgenoconv.o frams/vm/classes/genoobj.o frams/model/autoname.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF) 17 17 GENMAN_GDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF4) $(GENMANF9) $(GENMANFF) $(GENMANFT) 18 18 19 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.o19 GENMAN_COMMON_OBJS=frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o 20 20 21 21 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
r197 r205 9 9 #include <frams/vm/classes/collectionobj.h> 10 10 #include <frams/vm/classes/3dobject.h> 11 #include <frams/vm/classes/genoobj.h> 11 12 #include <common/nonstd_math.h> 12 13 #include <common/Convert.h> … … 711 712 deserializable_classes+=&Pt3D_Ext::getStaticParam(); 712 713 deserializable_classes+=&Orient_Ext::getStaticParam(); 714 deserializable_classes+=&GenoObj::getStaticParam(); 713 715 } 714 716 -
cpp/frams/util/extvalue.h
r197 r205 127 127 ExtValue(const SString &v) {sets(v);} 128 128 ExtValue(const ExtObject &srco) {seto(srco);} 129 static ExtValue invalid() {ExtValue v; v.setInvalid(); return v;} 129 130 long compare(const ExtValue& src) const; 130 131 int operator==(const ExtValue& src) const;
Note: See TracChangeset
for help on using the changeset viewer.