diff --git a/basegraph.cpp b/basegraph.cpp index 3aa4d21d..b8d65550 100644 --- a/basegraph.cpp +++ b/basegraph.cpp @@ -284,9 +284,9 @@ void display_data::set_projection(int ed) { for(int z=0; z graphrules; - auto encode(pshape s0, int d0, pshape s1, int d1) { + int encode(pshape s0, int d0, pshape s1, int d1) { return d0 + d1 * 16 + s0 * 256 + s1 * 512; } @@ -289,7 +289,7 @@ struct hrmap_kite : hrmap { auto c1 = c->cmove(dir); auto code = encode(getshape(c->master), dir, getshape(c1->master), c->c.spin(dir)); if(!graphrules.count(code)) { - println(hlog, "rule missing: ", tuple(getshape(c->master), dir, getshape(c1->master), c->c.spin(dir))); + println(hlog, "rule missing: ", make_tuple(getshape(c->master), dir, getshape(c1->master), c->c.spin(dir))); throw 0; } return graphrules[code]; diff --git a/sol.cpp b/sol.cpp index deb47201..a07c2ecd 100644 --- a/sol.cpp +++ b/sol.cpp @@ -14,8 +14,8 @@ namespace solv { const ld SXY = 32.; const ld SZ = 8.; - using pt = hyperpoint; - using ptlow = array; + typedef hyperpoint pt; + typedef array ptlow; ptlow inverse_exp_table[PRECZ][PRECX][PRECX];