From: Adam C. Emerson <aemerson@redhat.com>
Date: Wed, 10 Jan 2018 04:28:37 +0000 (-0500)
Subject: types: Output of arbitrary std::tuples
X-Git-Tag: v13.0.2~525^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dcd6d70eef92f2574ff2908f76915c278796ce6f;p=ceph.git

types: Output of arbitrary std::tuples

Again, using ceph::for_each

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/include/types.h b/src/include/types.h
index a5d533530e07..178051d323a2 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -101,8 +101,10 @@ template<class A, class Alloc>
 inline ostream& operator<<(ostream& out, const vector<A,Alloc>& v);
 template<class A, class Comp, class Alloc>
 inline ostream& operator<<(ostream& out, const deque<A,Alloc>& v);
-template<class A, class B, class C>
-inline ostream& operator<<(ostream&out, const boost::tuple<A, B, C> &t);
+template<typename... Ts>
+inline ostream& operator<<(ostream& out, const std::tuple<Ts...> &t);
+template<typename... Ts>
+inline ostream& operator<<(ostream& out, const boost::tuple<Ts...> &t);
 template<class A, class Alloc>
 inline ostream& operator<<(ostream& out, const list<A,Alloc>& ilist);
 template<class A, class Comp, class Alloc>
@@ -144,9 +146,21 @@ inline ostream& operator<<(ostream& out, const deque<A,Alloc>& v) {
   return out;
 }
 
-template<class A, class B, class C>
-inline ostream& operator<<(ostream&out, const boost::tuple<A, B, C> &t) {
-  out << boost::get<0>(t) <<"," << boost::get<1>(t) << "," << boost::get<2>(t);
+template<typename A, typename B, typename C>
+inline ostream& operator<<(ostream& out, const boost::tuple<A, B, C> &t) {
+  return out << boost::get<0>(t) << ","
+	     << boost::get<1>(t) << ","
+	     << boost::get<2>(t);
+}
+
+template<typename... Ts>
+inline ostream& operator<<(ostream& out, const std::tuple<Ts...> &t) {
+  auto f = [n = sizeof...(Ts), i = 0, &out](const auto& e) mutable {
+    out << e;
+    if (++i != n)
+      out << ",";
+  };
+  ceph::for_each(t, f);
   return out;
 }