Changeset 247 for cpp/frams/genetics/genman.h

Timestamp:

11/07/14 17:51:01 (10 years ago)

Author:

Maciej Komosinski

Message:

Sources support both 32-bit and 64-bit, and more compilers

File:

• cpp/frams/genetics/genman.h (modified) (2 diffs)

cpp/frams/genetics/genman.h

@@ -46 +46 @@
         Geno CrossOver(const Geno&, const Geno&); //returns xover genotype ("child") or empty if errors
         float Similarity(const Geno&, const Geno&); //returns GENOPER_NOOPER or normalized similarity (1: identical, 0: different)
-        unsigned long Style(const char* g, int pos); //returns Style (and validity) of a genotype char.
-        void GetFullStyle(const char *g, unsigned long *styletab); //optimized. Fills styletab with styles for all genotype chars. sizeof(*styletab) must be at least strlen(g).
+        uint32_t Style(const char* g, int pos); //returns Style (and validity) of a genotype char.
+        void GetFullStyle(const char *g, uint32_t *styletab); //optimized. Fills styletab with styles for all genotype chars. sizeof(*styletab) must be at least strlen(g).
         SString HTMLize(const char *g); //returns colored genotype in HTML.
         SString HTMLizeShort(const char *g); //returns colored genotype (abbreviated if needed) in HTML.
@@ -83 +83 @@
 #undef STATRICKCLASS
         void clearStats();
-        static void onDelGen(void*, long);
+        static void onDelGen(void*, intptr_t);
 };