From 3827ae4e821ff3758d1eaf2dbacc55a22f802731 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Mon, 17 Nov 2025 10:31:30 +0100 Subject: feat: fixing merge conflicts. Signed-off-by: Amlal El Mahrouss --- dev/lib/utility/cgi_writer.hpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'dev/lib/utility/cgi_writer.hpp') diff --git a/dev/lib/utility/cgi_writer.hpp b/dev/lib/utility/cgi_writer.hpp index 87354ac..d54d9de 100644 --- a/dev/lib/utility/cgi_writer.hpp +++ b/dev/lib/utility/cgi_writer.hpp @@ -4,15 +4,15 @@ * Copyright 2023-2025, Amlal El Mahrouss. */ -#ifndef _SCL_CGI_WRITER_HPP -#define _SCL_CGI_WRITER_HPP +#ifndef _OCL_CGI_WRITER_HPP +#define _OCL_CGI_WRITER_HPP #include #include #include #include -namespace scl +namespace ocl { namespace cgi { @@ -21,7 +21,7 @@ namespace scl class basic_writer { private: - basic_writer& eval_(const scl::basic_chunk_string& mime, const scl::basic_chunk_string& ss) noexcept + basic_writer& eval_(const ocl::basic_chunk_string& mime, const ocl::basic_chunk_string& ss) noexcept { std::basic_stringstream ss_out; @@ -30,7 +30,7 @@ namespace scl ss_out << std::format("Content-Length: {}\r\n\r\n", ss.str().size()); ss_out << ss.str(); - scl::io::print(ss_out.str()); + ocl::io::print(ss_out.str()); return *this; } @@ -43,37 +43,37 @@ namespace scl basic_writer(const basic_writer&) = default; public: - friend void operator<<(basic_writer& self, const scl::basic_chunk_string& ss_in) + friend void operator<<(basic_writer& self, const ocl::basic_chunk_string& ss_in) { self = self.eval_("text/plain", ss_in); } - basic_writer& binary(const scl::basic_chunk_string& ss_in) + basic_writer& binary(const ocl::basic_chunk_string& ss_in) { return this->eval_("application/octet-stream", ss_in); } - basic_writer& html(const scl::basic_chunk_string& ss_in) + basic_writer& html(const ocl::basic_chunk_string& ss_in) { return this->eval_("text/html", ss_in); } - basic_writer& xml(const scl::basic_chunk_string& ss_in) + basic_writer& xml(const ocl::basic_chunk_string& ss_in) { return this->eval_("application/xml", ss_in); } - basic_writer& json(const scl::basic_chunk_string& ss_in) + basic_writer& json(const ocl::basic_chunk_string& ss_in) { return this->eval_("application/json", ss_in); } - basic_writer& js(const scl::basic_chunk_string& ss_in) + basic_writer& js(const ocl::basic_chunk_string& ss_in) { return this->eval_("text/javascript", ss_in); } }; } // namespace cgi -} // namespace scl +} // namespace ocl -#endif // ifndef _SCL_CGI_WRITER_HPP +#endif // ifndef _OCL_CGI_WRITER_HPP -- cgit v1.2.3