From 2e50b45b3e30081175fdf2792c45462d07def67f Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Fri, 4 Mar 2016 17:06:32 +0100 Subject: [PATCH] Fixed template syntax to prevent ambiguity with stream operators This is a minor change but was noticed when trying to build with clang This message appeared while building using tizen-sdk 2.4.0 Rev4 with imported libs (built with gbs from Tizen:2.4:Mobile repo) Change-Id: Ib573d5ea9b23b29d6114d1f072210c370859fdec Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/6149 Tested-by: jenkins-iotivity Reviewed-by: Habib Virji (cherry picked from commit feee78125dc35f61f2f466096ebf41a764f5ee82) Reviewed-on: https://gerrit.iotivity.org/gerrit/5565 --- resource/include/OCUtilities.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resource/include/OCUtilities.h b/resource/include/OCUtilities.h index ac9d6ad..1c17c10 100644 --- a/resource/include/OCUtilities.h +++ b/resource/include/OCUtilities.h @@ -106,7 +106,7 @@ namespace OC template struct is_vector>::value + std::is_same >::value >::type > { @@ -130,17 +130,17 @@ namespace OC // specialization to handle the single-item case template class Base, typename T> - struct is_component> + struct is_component > { static constexpr bool value = std::is_same::value; }; // Recursive specialization to handle cases with multiple values template class Base, typename T, typename ...Rest> - struct is_component> + struct is_component > { static constexpr bool value = std::is_same::value - || is_component>::value; + || is_component >::value; }; } // namespace OC -- 2.7.4