From 5f083f2b67578016d38bf2e12c70decf352917a7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 11 Jul 2015 19:54:51 +0100
Subject: [PATCH] better to_string test

---
 octa/string.hh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/octa/string.hh b/octa/string.hh
index 2aa849c..2b6b092 100644
--- a/octa/string.hh
+++ b/octa/string.hh
@@ -479,15 +479,16 @@ AnyString<A> concat(std::initializer_list<T> v, const S &sep = " ") {
 
 namespace detail {
     template<typename T>
-    struct ToStringTest {
-        template<typename U, String (U::*)() const> struct Test {};
-        template<typename U> static char test(Test<U, &U::to_string> *);
-        template<typename U> static  int test(...);
-        static constexpr bool value = (sizeof(test<T>(0)) == sizeof(char));
-    };
+    auto test_tostring(int) ->
+        decltype(IsSame<decltype(declval<T>().to_string()), String>());
+    template<typename>
+    False test_tostring(...);
 
     template<typename T>
-    static True test_iterable(decltype(octa::iter(declval<T>())) *);
+    using ToStringTest = decltype(test_tostring<T>(0));
+
+    template<typename T>
+    True test_iterable(decltype(octa::iter(declval<T>())) *);
     template<typename> static False test_iterable(...);
 
     template<typename T>