Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2025-02-11 15:45:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make scaninc build under GCC (#218)

Browse Source
This commit is contained in:
Cameron Hall 2017-01-26 01:15:49 -05:00 committed by YamaArashi
parent 448acff16e
commit 72bc8f23d3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/scaninc/Makefile
View File

@ -1,6 +1,6 @@
CXX = g++
CXXFLAGS = -Wall -std=c++11 -O2
CXXFLAGS = -Wall -std=c++14 -O2
SRCS = scaninc.cpp c_file.cpp asm_file.cpp

4
tools/scaninc/c_file.cpp
View File

@ -202,9 +202,9 @@ void CFile::SkipWhitespace()
bool CFile::CheckIdentifier(const std::string& ident)
{
int i;
unsigned int i;
for (i = 0; (unsigned)i < ident.length() && m_pos + i < m_size; i++)
for (i = 0; i < ident.length() && m_pos + i < (unsigned)m_size; i++)
if (ident[i] != m_buffer[m_pos + i])
return false;

4
tools/scaninc/c_file.h
View File

@ -42,11 +42,11 @@ private:
std::string m_path;
std::set<std::string> m_incbins;
void CFile::RemoveComments();
void RemoveComments();
bool ConsumeHorizontalWhitespace();
bool ConsumeNewline();
void SkipWhitespace();
std::unique_ptr<unsigned char[]> CFile::ReadWholeFile(const std::string& path, int& size);
std::unique_ptr<unsigned char[]> ReadWholeFile(const std::string& path, int& size);
bool CheckIdentifier(const std::string& ident);
void CheckIncbin();
};