From 990599929835b7f3a07e254c0d234dc5c6f37dd7 Mon Sep 17 00:00:00 2001 From: jachoo Date: Sat, 19 Nov 2011 15:10:49 +0100 Subject: [PATCH] Fixed some compilation error on Linux --- src/game.cpp | 2 ++ src/map.cpp | 2 ++ src/utility.h | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 7e7300e..88b33ca 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -44,6 +44,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" #include "filesys.h" +#include + /* TODO: Move content-aware stuff to separate file by adding properties and virtual interfaces diff --git a/src/map.cpp b/src/map.cpp index 7985b11..94a26b4 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -39,6 +39,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" #include "profiler.h" +#include + #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")" /* diff --git a/src/utility.h b/src/utility.h index 1c32253..aea4585 100644 --- a/src/utility.h +++ b/src/utility.h @@ -960,13 +960,13 @@ inline T stonum_ex(const Str& s) } template -inline float stof_ex(const typename Str& s) { return stonum_ex(s); } +inline float stof_ex(const Str& s) { return stonum_ex(s); } template -inline double stod_ex(const typename Str& s) { return stonum_ex(s); } +inline double stod_ex(const Str& s) { return stonum_ex(s); } template -inline double stoi_ex(const typename Str& s) { return stonum_ex(s); } +inline double stoi_ex(const Str& s) { return stonum_ex(s); } inline std::string itos(s32 i) {