From d4dc97b5a62cb1899e44de72b04f42e0aa6e756d Mon Sep 17 00:00:00 2001
From: Danilo Piparo <danilo.piparo@cern.ch>
Date: Fri, 2 Jun 2017 07:08:52 +0200
Subject: [PATCH] [TDF] String in this context is not a container
---
tree/treeplayer/inc/ROOT/TDFUtils.hxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tree/treeplayer/inc/ROOT/TDFUtils.hxx b/tree/treeplayer/inc/ROOT/TDFUtils.hxx
index d6f99f20d98..3677d343c46 100644
--- a/tree/treeplayer/inc/ROOT/TDFUtils.hxx
+++ b/tree/treeplayer/inc/ROOT/TDFUtils.hxx
@@ -133,10 +133,10 @@ struct TIsContainer {
using It_t = typename A::iterator;
using CIt_t = typename A::const_iterator;
using V_t = typename A::value_type;
- return std::is_same<Test_t, std::vector<bool>>::value ||
+ return (!std::is_same<Test_t, std::string>::value) && (std::is_same<Test_t, std::vector<bool>>::value ||
(std::is_same<decltype(pt->begin()), It_t>::value && std::is_same<decltype(pt->end()), It_t>::value &&
std::is_same<decltype(cpt->begin()), CIt_t>::value && std::is_same<decltype(cpt->end()), CIt_t>::value &&
- std::is_same<decltype(**pi), V_t &>::value && std::is_same<decltype(**pci), V_t const &>::value);
+ std::is_same<decltype(**pi), V_t &>::value && std::is_same<decltype(**pci), V_t const &>::value));
}
template <typename A>
--
GitLab