Use std::string_view::value_type in BufferSearch

This commit is contained in:
Martchus 2021-07-16 15:58:40 +02:00
parent 77b2c3281f
commit 2bb04c64ea
2 changed files with 5 additions and 4 deletions

View File

@ -24,7 +24,7 @@ namespace CppUtilities {
/*! /*!
* \brief Processes the specified \a buffer. Invokes the callback according to the remarks mentioned in the class documentation. * \brief Processes the specified \a buffer. Invokes the callback according to the remarks mentioned in the class documentation.
*/ */
void BufferSearch::operator()(const char *buffer, std::size_t bufferSize) void BufferSearch::operator()(const std::string_view::value_type *buffer, std::size_t bufferSize)
{ {
if (m_hasResult || (!m_giveUpTerm.empty() && m_giveUpTermIterator == m_giveUpTerm.end())) { if (m_hasResult || (!m_giveUpTerm.empty() && m_giveUpTermIterator == m_giveUpTerm.end())) {
return; return;

View File

@ -17,8 +17,9 @@ public:
using CallbackType = std::function<void(BufferSearch &, std::string &&)>; using CallbackType = std::function<void(BufferSearch &, std::string &&)>;
BufferSearch(std::string_view searchTerm, std::string_view terminationChars, std::string_view giveUpTerm, CallbackType &&callback); BufferSearch(std::string_view searchTerm, std::string_view terminationChars, std::string_view giveUpTerm, CallbackType &&callback);
void operator()(std::string_view buffer); void operator()(std::string_view buffer);
void operator()(const char *buffer, std::size_t bufferSize); void operator()(const std::string_view::value_type *buffer, std::size_t bufferSize);
template <std::size_t bufferCapacity> void operator()(std::shared_ptr<std::array<char, bufferCapacity>> buffer, std::size_t bufferSize); template <std::size_t bufferCapacity>
void operator()(std::shared_ptr<std::array<std::string_view::value_type, bufferCapacity>> buffer, std::size_t bufferSize);
void reset(); void reset();
private: private:
@ -62,7 +63,7 @@ inline void BufferSearch::operator()(std::string_view buffer)
* \brief Processes the specified \a buffer which is a shared array with fixed \tp bufferCapacity. Invokes the callback according to the remarks mentioned in the class documentation. * \brief Processes the specified \a buffer which is a shared array with fixed \tp bufferCapacity. Invokes the callback according to the remarks mentioned in the class documentation.
*/ */
template <std::size_t bufferCapacity> template <std::size_t bufferCapacity>
inline void BufferSearch::operator()(std::shared_ptr<std::array<char, bufferCapacity>> buffer, std::size_t bufferSize) inline void BufferSearch::operator()(std::shared_ptr<std::array<std::string_view::value_type, bufferCapacity>> buffer, std::size_t bufferSize)
{ {
(*this)(buffer->data(), bufferSize); (*this)(buffer->data(), bufferSize);
} }