fixed some compiler issues

This commit is contained in:
Zeno Rogue 2019-10-12 14:04:46 +02:00
parent ecdb1aa6e7
commit d7cb0b1bd2
1 changed files with 4 additions and 4 deletions

View File

@ -361,7 +361,7 @@ int fiftyrule(coord c) {
bool is_bi(crystal_structure& cs, coord co); bool is_bi(crystal_structure& cs, coord co);
#if MAXMDIM >= 4 #if MAXMDIM >= 4
using shifttable = array<coord, 8>; typedef array<coord, 8> shifttable;
shifttable get_canonical(coord co) { shifttable get_canonical(coord co) {
shifttable res; shifttable res;
@ -380,7 +380,7 @@ shifttable get_canonical(coord co) {
#endif #endif
struct hrmap_crystal : hrmap_standard { struct hrmap_crystal : hrmap_standard {
heptagon *getOrigin() { return get_heptagon_at(c0, S7); } heptagon *getOrigin() override { return get_heptagon_at(c0, S7); }
map<heptagon*, coord> hcoords; map<heptagon*, coord> hcoords;
map<coord, heptagon*> heptagon_at; map<coord, heptagon*> heptagon_at;
@ -463,11 +463,11 @@ struct hrmap_crystal : hrmap_standard {
void build_east(int cid); void build_east(int cid);
void verify() { } void verify() override { }
void prepare_east(); void prepare_east();
heptagon *create_step(heptagon *h, int d) { heptagon *create_step(heptagon *h, int d) override {
if(!hcoords.count(h)) { if(!hcoords.count(h)) {
printf("not found\n"); printf("not found\n");
return NULL; return NULL;