tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 05:34:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle boost::beast::http::basic_fields#set() signature change (v1.81)

Browse Source 
Make String convertible to boost::beast::string_view (always working),
not boost::string_view (broken).
This commit is contained in:
Alexander A. Klimov 2023-01-04 17:02:19 +01:00
parent 27d46a4e5a
commit 68198f2ef9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/base/string.cpp
View File

@ -128,15 +128,15 @@ String::operator const std::string&() const
} }
/** /**
* Conversion function to boost::string_view. * Conversion function to boost::beast::string_view.
* *
* This allows using String as the value for HTTP headers in boost::beast::http::basic_fields::set. * This allows using String as the value for HTTP headers in boost::beast::http::basic_fields::set.
* *
* @return A boost::string_view representing this string. * @return A boost::beast::string_view representing this string.
*/ */
String::operator boost::string_view() const String::operator boost::beast::string_view() const
{ {
return boost::string_view(m_Data); return boost::beast::string_view(m_Data);
} }
const char *String::CStr() const const char *String::CStr() const

3
lib/base/string.hpp
View File

@ -5,6 +5,7 @@
#include "base/i2-base.hpp" #include "base/i2-base.hpp"
#include "base/object.hpp" #include "base/object.hpp"
#include <boost/beast/core.hpp>
#include <boost/range/iterator.hpp> #include <boost/range/iterator.hpp>
#include <boost/utility/string_view.hpp> #include <boost/utility/string_view.hpp>
#include <functional> #include <functional>
@ -73,7 +74,7 @@ public:
bool operator<(const String& rhs) const; bool operator<(const String& rhs) const;
operator const std::string&() const; operator const std::string&() const;
operator boost::string_view() const; operator boost::beast::string_view() const;
const char *CStr() const; const char *CStr() const;