Fix compile errors on msys2 gcc 7.1

miki151 · Jul 27, 2017 · 66c31bf · 66c31bf
1 parent 9d03d42
commit 66c31bf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Makefile-win b/Makefile-win
@@ -2,7 +2,7 @@
 
 CC = g++
 LD = g++
-CFLAGS = -Wall -std=c++1y -Wno-sign-compare -Wno-unused-variable -Wl,--stack,16000000
+CFLAGS = -Wall -std=c++1y -Wno-sign-compare -Wno-unused-variable -Wno-strict-aliasing -Wl,--stack,16000000
 
 ifdef DATA_DIR
 	CFLAGS += -DDATA_DIR=\"$(DATA_DIR)\"

diff --git a/extern/variant.h b/extern/variant.h
@@ -402,7 +402,7 @@ class EnumT {
 
     bool operator == (const Self& other) const {
       return tag == other.tag && visit([&](const auto& o1) {
-          return other.getReferenceMaybe<
+          return other.template getReferenceMaybe<
               typename std::remove_const<typename std::remove_reference<decltype(o1)>::type>::type>() == o1; } );
     }
 

diff --git a/my_containers.h b/my_containers.h
@@ -314,12 +314,12 @@ class vector {
       return *this;
     }
 
-    Iterator operator++(int) const {
+    Iterator operator++(int) {
       checkParent();
       return Iterator(it++, parent);
     }
 
-    Iterator operator--(int) const {
+    Iterator operator--(int) {
       checkParent();
       return Iterator(it--, parent);
     }

diff --git a/stdafx.h b/stdafx.h
@@ -40,6 +40,7 @@
 #include <iostream>
 #include <fstream>
 #include <algorithm>
+#include <functional>
 #include <sstream>
 #include <string>
 #include <cstdlib>