OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fix ToString

master
Daniel Kolesa 2015-07-11 20:18:46 +01:00
parent 5f083f2b67
commit 02bc84dbb5
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
octa/string.hh
View File

@ -535,12 +535,6 @@ struct ToString<T, EnableIf<detail::ToStringTest<T>::value>> {
}
};
template<typename T> struct ToString<const T, EnableIf<
!detail::IterableTest<T>::value &&
!detail::ToStringTest<T>::value &&
!IsScalar<T>::value
>>: ToString<T> {};
namespace detail {
template<typename T>
void str_printf(Vector<char> *s, const char *fmt, T v) {
@ -623,6 +617,14 @@ template<> struct ToString<const char *> {
}
};
template<> struct ToString<char *> {
using Argument = char *;
using Result = String;
String operator()(char *s) {
return String(s);
}
};
template<> struct ToString<String> {
using Argument = String;
using Result = String;
@ -644,9 +646,9 @@ template<typename T, typename U> struct ToString<Pair<T, U>> {
using Result = String;
String operator()(const Argument &v) {
String ret("{");
ret += ToString<T>()(v.first);
ret += ToString<RemoveReference<RemoveCv<T>>>()(v.first);
ret += ", ";
ret += ToString<U>()(v.second);
ret += ToString<RemoveReference<RemoveCv<U>>>()(v.second);
ret += "}";
return ret;
}
@ -654,7 +656,7 @@ template<typename T, typename U> struct ToString<Pair<T, U>> {
template<typename T>
typename ToString<T>::Result to_string(const T &v) {
return ToString<T>()(v);
return ToString<RemoveReference<RemoveCv<T>>>()(v);
}
template<typename T>