From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 3 Feb 2016 23:02:49 +0000 (-0500)
Subject: librgw: fix boost::basic_string_ref template instantiation
X-Git-Tag: v10.1.0~382^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=244ad79f6c32d0d9b776b6a743cfb951412e490f;p=ceph.git

librgw: fix boost::basic_string_ref template instantiation

The commit adding Seastar sstring.h replaced a part of the interface
which used an internal string-view type, with an equivalent using
basic_string_ref from Boost.  I relied on a default template argument
not present in older versions.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/common/sstring.hh b/src/common/sstring.hh
index a2354080e22..b0f7a12c7cd 100644
--- a/src/common/sstring.hh
+++ b/src/common/sstring.hh
@@ -533,8 +533,8 @@ public:
     const char_type& operator[](size_type pos) const {
         return str()[pos];
     }
-    operator boost::basic_string_ref<char_type>() const {
-	return boost::basic_string_ref<char_type>(str(), size());
+    operator boost::basic_string_ref<char_type, traits_type>() const {
+		return boost::basic_string_ref<char_type, traits_type>(str(), size());
     }
     template <typename string_type, typename T>
     friend inline string_type to_sstring(T value);
@@ -616,7 +616,8 @@ namespace std {
 template <typename char_type, typename size_type, size_type max_size>
 struct hash<basic_sstring<char_type, size_type, max_size>> {
     size_t operator()(const basic_sstring<char_type, size_type, max_size>& s) const {
-	return std::hash<boost::basic_string_ref<char_type>>()(s);
+		using traits_type = std::char_traits<char_type>;
+		return std::hash<boost::basic_string_ref<char_type,traits_type>>()(s);
     }
 };