Fixed some compilation error on Linux
parent
21fa08bba3
commit
9905999298
|
@ -44,6 +44,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "filesys.h"
|
#include "filesys.h"
|
||||||
|
|
||||||
|
#include <typeinfo>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
TODO: Move content-aware stuff to separate file by adding properties
|
TODO: Move content-aware stuff to separate file by adding properties
|
||||||
and virtual interfaces
|
and virtual interfaces
|
||||||
|
|
|
@ -39,6 +39,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "profiler.h"
|
#include "profiler.h"
|
||||||
|
|
||||||
|
#include <typeinfo>
|
||||||
|
|
||||||
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
|
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -960,13 +960,13 @@ inline T stonum_ex(const Str& s)
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Str>
|
template<class Str>
|
||||||
inline float stof_ex(const typename Str& s) { return stonum_ex<float>(s); }
|
inline float stof_ex(const Str& s) { return stonum_ex<float>(s); }
|
||||||
|
|
||||||
template<class Str>
|
template<class Str>
|
||||||
inline double stod_ex(const typename Str& s) { return stonum_ex<double>(s); }
|
inline double stod_ex(const Str& s) { return stonum_ex<double>(s); }
|
||||||
|
|
||||||
template<class Str>
|
template<class Str>
|
||||||
inline double stoi_ex(const typename Str& s) { return stonum_ex<int>(s); }
|
inline double stoi_ex(const Str& s) { return stonum_ex<int>(s); }
|
||||||
|
|
||||||
inline std::string itos(s32 i)
|
inline std::string itos(s32 i)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue