amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation in gcc

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-04-10 17:44:29 +02:00
parent 12715e3845
commit f76a1230c4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/spec_sort.cpp
+4 -4
View File
@@ -120,7 +120,7 @@ void cycle_sort(const String& spec, String& input, String& ret) {
// count occurences of each char in spec // count occurences of each char in spec
FOR_EACH_CONST(s, spec) { FOR_EACH_CONST(s, spec) {
UInt c = 0; UInt c = 0;
FOR_EACH(i, input) { for(wxUniCharRef i : input) {
if (s == i) { if (s == i) {
i = REMOVED; // remove i = REMOVED; // remove
c++; c++;
@@ -159,7 +159,7 @@ void cycle_sort(const String& spec, String& input, String& ret) {
/// Sort a string, keeping the characters in the original order /// Sort a string, keeping the characters in the original order
/** Removed used characters from input! */ /** Removed used characters from input! */
void mixed_sort(const String& spec, String& input, String& ret) { void mixed_sort(const String& spec, String& input, String& ret) {
FOR_EACH(c, input) { for (wxUniCharRef c : input) {
if (spec.find(c) != String::npos) { if (spec.find(c) != String::npos) {
ret += c; ret += c;
c = REMOVED; c = REMOVED;
@@ -223,7 +223,7 @@ void in_place_sort(const String& spec, String& input, String& ret) {
spec_sort(spec, input, result); spec_sort(spec, input, result);
// restore into the same order as in 'input' // restore into the same order as in 'input'
size_t pos_r = 0; size_t pos_r = 0;
FOR_EACH(c, input) { FOR_EACH_CONST(c, input) {
if (c == REMOVED) { if (c == REMOVED) {
if (pos_r < result.size()) { if (pos_r < result.size()) {
ret += result.GetChar(pos_r++); ret += result.GetChar(pos_r++);
@@ -241,7 +241,7 @@ String spec_sort(const String& spec, String& input, String& ret) {
SpecIterator it(spec); SpecIterator it(spec);
while(it.nextUntil(0)) { while(it.nextUntil(0)) {
if (it.escaped) { // single character, escaped if (it.escaped) { // single character, escaped
FOR_EACH(d, input) { for (wxUniCharRef d : input) {
if (d == it.value) { if (d == it.value) {
ret += d; ret += d;
d = REMOVED; d = REMOVED;