From a37e8bc6f86f809702e6bf74219b65fdb999f9da Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 11 Jul 2015 20:21:49 +0100
Subject: [PATCH] more ToString fixes

---
 octa/string.hh | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/octa/string.hh b/octa/string.hh
index fb3d871..9faebbd 100644
--- a/octa/string.hh
+++ b/octa/string.hh
@@ -500,7 +500,7 @@ struct ToString;
 
 template<typename T>
 struct ToString<T, EnableIf<detail::IterableTest<T>::value>> {
-    using Argument = T;
+    using Argument = RemoveCv<RemoveReference<T>>;
     using Result = String;
 
     String operator()(const T &v) const {
@@ -515,19 +515,9 @@ struct ToString<T, EnableIf<detail::IterableTest<T>::value>> {
     }
 };
 
-template<typename T>
-struct ToString<T, EnableIf<IsScalar<T>::value>> {
-    using Argument = T;
-    using Result = String;
-
-    String operator()(const T &v) const {
-       return ToString<T>()(v);
-    }
-};
-
 template<typename T>
 struct ToString<T, EnableIf<detail::ToStringTest<T>::value>> {
-    using Argument = T;
+    using Argument = RemoveCv<RemoveReference<T>>;
     using Result = String;
 
     String operator()(const T &v) const {