summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorSonicadvance1 <sonicadvance1@gmail.com>2009-11-08 10:37:04 +0000
committerSonicadvance1 <sonicadvance1@gmail.com>2009-11-08 10:37:04 +0000
commit3fa2c9fbac168d4bde8f36881091caf5e84afd73 (patch)
tree73ebf3571dd5dad98ace0821eacabe5e24cabc45 /Source/Core
parent6c88f9e652ed5ba285faf7f778c8f9bfa7ce1c2e (diff)
Fix Linux compiling entirely
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4518 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/Src/LuaInterface.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/Core/Core/Src/LuaInterface.cpp b/Source/Core/Core/Src/LuaInterface.cpp
index 6b4bc8b3cf..72fe99cc67 100644
--- a/Source/Core/Core/Src/LuaInterface.cpp
+++ b/Source/Core/Core/Src/LuaInterface.cpp
@@ -3839,8 +3839,8 @@ struct TieredRegion
bool Contains(unsigned int address, int size) const
{
- std::vector<Island>::const_iterator iter = islands.begin();
- std::vector<Island>::const_iterator end = islands.end();
+ typename std::vector<Island>::const_iterator iter;// = islands.begin();
+ typename std::vector<Island>::const_iterator end;// = islands.end();
for(; iter != end; ++iter)
if(iter->Contains(address, size))
return true;
@@ -3863,7 +3863,10 @@ struct TieredRegion
TieredRegion()
{
- Calculate(std::vector<unsigned int>);
+ std::vector<unsigned int> bytes;
+ Calculate(bytes);
+ // GCC didn't like the old style
+ // Calculate(std::vector<unsigned int>());
}
__forceinline int NotEmpty()