From a5e0efc4082260180d4666a4941028da9d276b5b Mon Sep 17 00:00:00 2001 From: Aleksey Lobanov Date: Sun, 7 Jun 2015 13:22:27 +0300 Subject: [PATCH] Compiles with C++11 now. Used words now contains 4bytes-numbers --- src/crossgen.hpp | 2 +- wxCrossGen/wxCrossGen.mk | 2 +- wxCrossGen/wxCrossGen.project | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crossgen.hpp b/src/crossgen.hpp index ca7c996..4d7721e 100644 --- a/src/crossgen.hpp +++ b/src/crossgen.hpp @@ -11,7 +11,7 @@ typedef std::vector< std::vector > GridType; typedef std::vector< std::vector > CurGridType; // Fisrt index is a word length typedef std::vector< std::vector > AllWordsType; -typedef std::set< size_t > UsedWords; +typedef std::set< uint32_t > UsedWords; struct WordInfo { size_t x; diff --git a/wxCrossGen/wxCrossGen.mk b/wxCrossGen/wxCrossGen.mk index ae86bfc..6ca35a6 100644 --- a/wxCrossGen/wxCrossGen.mk +++ b/wxCrossGen/wxCrossGen.mk @@ -50,7 +50,7 @@ LibPath := $(LibraryPathSwitch). AR := /usr/bin/ar rcu CXX := /usr/bin/g++-4.8 CC := /usr/bin/gcc-4.8 -CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors) +CXXFLAGS := -std=c++11 -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors) CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors) ASFLAGS := AS := /usr/bin/as diff --git a/wxCrossGen/wxCrossGen.project b/wxCrossGen/wxCrossGen.project index 76f1dad..df3422c 100644 --- a/wxCrossGen/wxCrossGen.project +++ b/wxCrossGen/wxCrossGen.project @@ -34,7 +34,7 @@ - +