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/logic/equiv.hpp | 4 ++-- dev/lib/logic/math.hpp | 4 ++-- dev/lib/logic/opt.hpp | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'dev/lib/logic') diff --git a/dev/lib/logic/equiv.hpp b/dev/lib/logic/equiv.hpp index 05d0f53..5b022f8 100644 --- a/dev/lib/logic/equiv.hpp +++ b/dev/lib/logic/equiv.hpp @@ -8,7 +8,7 @@ #pragma once /// @brief OCL equivalence namespace. -namespace scl::equiv +namespace ocl::equiv { template struct basic_hash_trait @@ -101,4 +101,4 @@ namespace scl::equiv return left_ / right_ == 1; } }; -} // namespace scl::equiv +} // namespace ocl::equiv diff --git a/dev/lib/logic/math.hpp b/dev/lib/logic/math.hpp index 2d00595..e796eae 100644 --- a/dev/lib/logic/math.hpp +++ b/dev/lib/logic/math.hpp @@ -9,7 +9,7 @@ #include -namespace scl +namespace ocl { template struct is_non_boolean_integer final @@ -32,4 +32,4 @@ namespace scl constexpr inline auto not_a_number = NAN; constexpr inline auto positive_infinity = INFINITY; constexpr inline auto negative_infinity = -positive_infinity; -} // namespace scl \ No newline at end of file +} // namespace ocl \ No newline at end of file diff --git a/dev/lib/logic/opt.hpp b/dev/lib/logic/opt.hpp index 4ce999c..137460c 100644 --- a/dev/lib/logic/opt.hpp +++ b/dev/lib/logic/opt.hpp @@ -4,13 +4,13 @@ * Copyright 2023-2025, Amlal El Mahrouss */ -#ifndef _SCL_OPT_HPP -#define _SCL_OPT_HPP +#ifndef _OCL_OPT_HPP +#define _OCL_OPT_HPP #include #include -namespace scl +namespace ocl { enum class return_type { @@ -129,6 +129,6 @@ namespace scl { return return_type::err; } -} // namespace scl +} // namespace ocl -#endif /* ifndef _SCL_OPT_HPP */ +#endif /* ifndef _OCL_OPT_HPP */ -- cgit v1.2.3