From 2a1a167a0d8cc9e534dc00ebe26de935df613fe1 Mon Sep 17 00:00:00 2001
From: Yichao Yu <yyc1992@gmail.com>
Date: Thu, 19 Jun 2014 00:33:20 +0800
Subject: [PATCH] print

---
 src/c_wrapper/clhelper.h |  3 +--
 src/c_wrapper/clobj.h    |  2 --
 src/c_wrapper/error.h    |  4 ++--
 src/c_wrapper/utils.h    | 29 ++++++++++++-----------------
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/c_wrapper/clhelper.h b/src/c_wrapper/clhelper.h
index 5285be8d..17962280 100644
--- a/src/c_wrapper/clhelper.h
+++ b/src/c_wrapper/clhelper.h
@@ -190,9 +190,8 @@ public:
             call_guarded_cleanup(m_release, m_name, m_clobj);
         }
     }
-    template<bool out>
     PYOPENCL_INLINE void
-    print(std::ostream &stm)
+    print(std::ostream &stm, bool out=false)
     {
         if (!out) {
             stm << &m_clobj;
diff --git a/src/c_wrapper/clobj.h b/src/c_wrapper/clobj.h
index 4846f26f..82cb45be 100644
--- a/src/c_wrapper/clobj.h
+++ b/src/c_wrapper/clobj.h
@@ -67,7 +67,6 @@ public:
     {
         return m_obj.data();
     }
-    template<bool>
     PYOPENCL_INLINE void
     print(std::ostream &stm)
     {
@@ -91,7 +90,6 @@ public:
     {
         return m_obj->data();
     }
-    template<bool>
     PYOPENCL_INLINE void
     print(std::ostream &stm)
     {
diff --git a/src/c_wrapper/error.h b/src/c_wrapper/error.h
index f59c1e13..dfcef093 100644
--- a/src/c_wrapper/error.h
+++ b/src/c_wrapper/error.h
@@ -111,7 +111,7 @@ struct __CLPrintOut<T, typename std::enable_if<
     static PYOPENCL_INLINE void
     call(T v, std::ostream &stm)
     {
-        v.template print<true>(stm);
+        v.print(stm, true);
         stm << ", ";
     }
 };
@@ -121,7 +121,7 @@ struct __CLPrint {
     static PYOPENCL_INLINE void
     call(T v, std::ostream &stm)
     {
-        v.template print<false>(stm);
+        v.print(stm);
         stm << ", ";
     }
 };
diff --git a/src/c_wrapper/utils.h b/src/c_wrapper/utils.h
index bc4ecc44..ddb45bf9 100644
--- a/src/c_wrapper/utils.h
+++ b/src/c_wrapper/utils.h
@@ -30,19 +30,19 @@ tostring(const T& v)
 namespace pyopencl {
 
 // TODO
-template<typename T, bool, class = void>
+template<typename T, class = void>
 struct CLGenericArgPrinter {
     static PYOPENCL_INLINE void
-    print(std::ostream &stm, T &arg)
+    print(std::ostream &stm, T &arg, bool)
     {
         stm << arg;
     }
 };
 
-template<bool out>
-struct CLGenericArgPrinter<std::nullptr_t, out, void> {
+template<>
+struct CLGenericArgPrinter<std::nullptr_t, void> {
     static PYOPENCL_INLINE void
-    print(std::ostream &stm, std::nullptr_t&)
+    print(std::ostream &stm, std::nullptr_t&, bool)
     {
         stm << (void*)nullptr;
     }
@@ -70,11 +70,10 @@ public:
     {
         return m_arg;
     }
-    template<bool out>
     PYOPENCL_INLINE void
-    print(std::ostream &stm)
+    print(std::ostream &stm, bool out=false)
     {
-        CLGenericArgPrinter<T, out>::print(stm, m_arg);
+        CLGenericArgPrinter<T>::print(stm, m_arg, out);
     }
 };
 
@@ -229,9 +228,8 @@ public:
     {
         return _ArgBufferConverter<Buff>::convert(m_buff);
     }
-    template<bool out>
     PYOPENCL_INLINE void
-    print(std::ostream &stm)
+    print(std::ostream &stm, bool out=false)
     {
         _print_buf(stm, m_buff, Buff::arg_type, out || !is_out);
     }
@@ -274,9 +272,8 @@ public:
     {
         return m_t;
     }
-    template<bool out>
     PYOPENCL_INLINE void
-    print(std::ostream &stm)
+    print(std::ostream &stm, bool out=false)
     {
         if (!out) {
             stm << m_t;
@@ -335,11 +332,10 @@ public:
             m_arg.cleanup(m_converted);
         }
     }
-    template<bool out>
     PYOPENCL_INLINE void
-    print(std::ostream &stm)
+    print(std::ostream &stm, bool out=false)
     {
-        m_arg.template print<out>(stm);
+        m_arg.print(stm, out);
     }
 };
 
@@ -409,9 +405,8 @@ public:
     {
         return std::make_tuple(m_buff.len(), m_buff.get());
     }
-    template<bool out>
     PYOPENCL_INLINE void
-    print(std::ostream &stm)
+    print(std::ostream &stm, bool out=false)
     {
         _print_buf(stm, m_buff, ArgType::Length, out || !is_out);
     }
-- 
GitLab