Removed std::byte usage from ResponseWriter::send() since requires C++17 which...

Removed std::byte usage from ResponseWriter::send() since requires C++17 which we're not ready for yet...
parent aef39484
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <string> #include <string>
#include <cstddef>
#include <sys/timerfd.h> #include <sys/timerfd.h>
...@@ -501,7 +500,7 @@ public: ...@@ -501,7 +500,7 @@ public:
code_ = Http::Code::Method_Not_Allowed; code_ = Http::Code::Method_Not_Allowed;
headers_.add(std::make_shared<Http::Header::Allow>(supportedMethods)); headers_.add(std::make_shared<Http::Header::Allow>(supportedMethods));
std::string body = codeString(Pistache::Http::Code::Method_Not_Allowed); std::string body = codeString(Pistache::Http::Code::Method_Not_Allowed);
return putOnWire(reinterpret_cast<const std::byte *>(body.c_str()), body.size()); return putOnWire(body.c_str(), body.size());
} }
Async::Promise<ssize_t> send(Code code) { Async::Promise<ssize_t> send(Code code) {
...@@ -524,7 +523,7 @@ public: ...@@ -524,7 +523,7 @@ public:
headers_.add(std::make_shared<Header::ContentType>(mime)); headers_.add(std::make_shared<Header::ContentType>(mime));
} }
return putOnWire(reinterpret_cast<const std::byte *>(body.c_str()), body.size()); return putOnWire(body.c_str(), body.size());
} }
template<size_t N> template<size_t N>
...@@ -534,15 +533,12 @@ public: ...@@ -534,15 +533,12 @@ public:
const Mime::MediaType& mime = Mime::MediaType()) const Mime::MediaType& mime = Mime::MediaType())
{ {
return send( return send(
code, code, arr, N - 1, std::forward<const Mime::MediaType&>(mime));
reinterpret_cast<const std::byte *>(arr),
N - 1,
std::forward<const Mime::MediaType&>(mime));
} }
Async::Promise<ssize_t> send( Async::Promise<ssize_t> send(
Code code, Code code,
const std::byte *data, const char* data,
const size_t size, const size_t size,
const Mime::MediaType& mime = Mime::MediaType()) const Mime::MediaType& mime = Mime::MediaType())
{ {
...@@ -624,7 +620,7 @@ private: ...@@ -624,7 +620,7 @@ private:
timeout_.associatePeer(peer_); timeout_.associatePeer(peer_);
} }
Async::Promise<ssize_t> putOnWire(const std::byte* data, size_t len); Async::Promise<ssize_t> putOnWire(const char* data, size_t len);
std::weak_ptr<Tcp::Peer> peer_; std::weak_ptr<Tcp::Peer> peer_;
DynamicStreamBuf buf_; DynamicStreamBuf buf_;
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include <ctime> #include <ctime>
#include <iomanip> #include <iomanip>
#include <unordered_map> #include <unordered_map>
#include <cstddef>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
...@@ -640,7 +639,7 @@ ResponseStream::ends() { ...@@ -640,7 +639,7 @@ ResponseStream::ends() {
} }
Async::Promise<ssize_t> Async::Promise<ssize_t>
ResponseWriter::putOnWire(const std::byte* data, size_t len) ResponseWriter::putOnWire(const char* data, size_t len)
{ {
try { try {
std::ostream os(&buf_); std::ostream os(&buf_);
...@@ -667,7 +666,7 @@ ResponseWriter::putOnWire(const std::byte* data, size_t len) ...@@ -667,7 +666,7 @@ ResponseWriter::putOnWire(const std::byte* data, size_t len)
OUT(os << crlf); OUT(os << crlf);
if (len > 0) { if (len > 0) {
OUT(os.write(reinterpret_cast<const char *>(data), len)); OUT(os.write(data, len));
} }
auto buffer = buf_.buffer(); auto buffer = buf_.buffer();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment