diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-11-17 10:31:30 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-11-17 10:31:30 +0100 |
| commit | 3827ae4e821ff3758d1eaf2dbacc55a22f802731 (patch) | |
| tree | 0768b1a509bd104627675127f1e9785c702e7621 /dev/lib/net | |
| parent | 5c5a101c9618f8edea5038e94df64508b0f0a70e (diff) | |
feat: fixing merge conflicts.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/lib/net')
| -rw-r--r-- | dev/lib/net/modem.hpp | 12 | ||||
| -rw-r--r-- | dev/lib/net/url.hpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/dev/lib/net/modem.hpp b/dev/lib/net/modem.hpp index 6c63399..0e935c7 100644 --- a/dev/lib/net/modem.hpp +++ b/dev/lib/net/modem.hpp @@ -5,8 +5,8 @@ * Copyright 2025, Amlal El Mahrouss */ -#ifndef _SCL_NET_NETWORK_HPP -#define _SCL_NET_NETWORK_HPP +#ifndef _OCL_NET_NETWORK_HPP +#define _OCL_NET_NETWORK_HPP #include <unistd.h> #include <arpa/inet.h> @@ -14,9 +14,9 @@ #include <string> #include <cstddef> -#define SCL_MODEM_INTERFACE : public scl::net::basic_modem +#define OCL_MODEM_INTERFACE : public ocl::net::basic_modem -namespace scl::net +namespace ocl::net { class basic_modem; @@ -151,6 +151,6 @@ namespace scl::net return true; } }; -} // namespace scl::net +} // namespace ocl::net -#endif // ifndef _SCL_NET_NETWORK_HPP +#endif // ifndef _OCL_NET_NETWORK_HPP diff --git a/dev/lib/net/url.hpp b/dev/lib/net/url.hpp index 52991f2..83ab587 100644 --- a/dev/lib/net/url.hpp +++ b/dev/lib/net/url.hpp @@ -13,7 +13,7 @@ /// @author Amlal El Mahrouss (amlal@nekernel.org) /// @brief Parse URLs (in a non-standard way). -namespace scl::net +namespace ocl::net { template <typename char_type> class basic_url; @@ -91,4 +91,4 @@ namespace scl::net return m_ss_.size() > 0 && this->protocol_exists(); } }; -} // namespace scl::net +} // namespace ocl::net |