forked from Mirrorlandia_minetest/minetest
Use the standard to_string() functions for C++11 (#4279)
If compiling according to a C++ version before C++11, then define std::to_string ourselves. Add a to_wstring version as well As std::to_string() for floating point types uses %.6f as floating point format converter, instead of %G, it needs special care. To preserve ftos() behavior (which is expected to use the %G format converter), it no longer uses to_string().
This commit is contained in:
parent
35f47e5461
commit
b11720af45
@ -820,7 +820,7 @@ void Client::initLocalMapSaving(const Address &address,
|
||||
const std::string world_path = porting::path_user
|
||||
+ DIR_DELIM + "worlds"
|
||||
+ DIR_DELIM + "server_"
|
||||
+ hostname + "_" + to_string(address.getPort());
|
||||
+ hostname + "_" + std::to_string(address.getPort());
|
||||
|
||||
fs::CreateAllDirs(world_path);
|
||||
|
||||
|
@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
#include <iomanip>
|
||||
#include <cctype>
|
||||
|
||||
#define STRINGIFY(x) #x
|
||||
@ -350,23 +351,57 @@ inline T from_string(const std::string &str)
|
||||
/// Returns a 64-bit signed value represented by the string \p str (decimal).
|
||||
inline s64 stoi64(const std::string &str) { return from_string<s64>(str); }
|
||||
|
||||
// TODO: Replace with C++11 std::to_string.
|
||||
#if __cplusplus < 201103L
|
||||
namespace std {
|
||||
|
||||
/// Returns a string representing the value \p val.
|
||||
template <typename T>
|
||||
inline std::string to_string(T val)
|
||||
inline string to_string(T val)
|
||||
{
|
||||
std::ostringstream oss;
|
||||
ostringstream oss;
|
||||
oss << val;
|
||||
return oss.str();
|
||||
}
|
||||
#define DEFINE_STD_TOSTRING_FLOATINGPOINT(T) \
|
||||
template <> \
|
||||
inline string to_string<T>(T val) \
|
||||
{ \
|
||||
ostringstream oss; \
|
||||
oss << std::fixed \
|
||||
<< std::setprecision(6) \
|
||||
<< val; \
|
||||
return oss.str(); \
|
||||
}
|
||||
DEFINE_STD_TOSTRING_FLOATINGPOINT(float)
|
||||
DEFINE_STD_TOSTRING_FLOATINGPOINT(double)
|
||||
DEFINE_STD_TOSTRING_FLOATINGPOINT(long double)
|
||||
|
||||
#undef DEFINE_STD_TOSTRING_FLOATINGPOINT
|
||||
|
||||
/// Returns a wide string representing the value \p val
|
||||
template <typename T>
|
||||
inline wstring to_wstring(T val)
|
||||
{
|
||||
return utf8_to_wide(to_string(val));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/// Returns a string representing the decimal value of the 32-bit value \p i.
|
||||
inline std::string itos(s32 i) { return to_string(i); }
|
||||
inline std::string itos(s32 i) { return std::to_string(i); }
|
||||
/// Returns a string representing the decimal value of the 64-bit value \p i.
|
||||
inline std::string i64tos(s64 i) { return to_string(i); }
|
||||
inline std::string i64tos(s64 i) { return std::to_string(i); }
|
||||
|
||||
// std::to_string uses the '%.6f' conversion, which is inconsistent with
|
||||
// std::ostream::operator<<() and impractical too. ftos() uses the
|
||||
// more generic and std::ostream::operator<<()-compatible '%G' format.
|
||||
/// Returns a string representing the decimal value of the float value \p f.
|
||||
inline std::string ftos(float f) { return to_string(f); }
|
||||
inline std::string ftos(float f)
|
||||
{
|
||||
std::ostringstream oss;
|
||||
oss << f;
|
||||
return oss.str();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user