feat: fixing merge conflicts.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>

5 files changed, 15 insertions, 15 deletions

diff --git a/dev/tests/chunk_string/chunk_test.cc b/dev/tests/chunk_string/chunk_test.cc
index b24b332..ad3d31b 100644
--- a/dev/tests/chunk_string/chunk_test.cc
+++ b/dev/tests/chunk_string/chunk_test.cc
@@ -16,7 +16,7 @@ TEST(ChunkTest, BasicChunkUsage)
 
 	auto start = std::chrono::high_resolution_clock::now();
 
-	scl::basic_chunk_string<char, 1000000> optimized;
+	ocl::basic_chunk_string<char, 1000000> optimized;
 
 	for (unsigned i = 0; i < iterations; ++i)
  	{
diff --git a/dev/tests/fix_basic/fix_test.cc b/dev/tests/fix_basic/fix_test.cc
index 5457f21..1c80716 100644
--- a/dev/tests/fix_basic/fix_test.cc
+++ b/dev/tests/fix_basic/fix_test.cc
@@ -10,9 +10,9 @@
 
 TEST(FIXTest, BasicFIXUsage)
 {
-	scl::fix::basic_visitor<char>	 basic_visitor;
-	scl::fix::basic_range_data<char> fix = basic_visitor.visit("8=FIX.4.2|9=65|35=A|49=SERVER|56=CLIENT|34=177|52=20090107-18:15:16|98=0|108=30|10=062|");
+	ocl::fix::basic_visitor<char>	 basic_visitor;
+	ocl::fix::basic_range_data<char> fix = basic_visitor.visit("8=FIX.4.2|9=65|35=A|49=SERVER|56=CLIENT|34=177|52=20090107-18:15:16|98=0|108=30|10=062|");
 
-	EXPECT_EQ(fix.magic_, scl::fix::detail::begin_fix());
+	EXPECT_EQ(fix.magic_, ocl::fix::detail::begin_fix());
 	EXPECT_TRUE(fix.is_valid());
 }
diff --git a/dev/tests/network_basic/net_test.cc b/dev/tests/network_basic/net_test.cc
index 4bd3a9f..61d0b28 100644
--- a/dev/tests/network_basic/net_test.cc
+++ b/dev/tests/network_basic/net_test.cc
@@ -12,8 +12,8 @@
 
 TEST(NetworkTest, BasicNetworkUsage)
 {
-	scl::net::basic_modem modem;
-	modem.construct<AF_INET, SOCK_STREAM, 8000>(scl::net::basic_modem::local_address_ip4, true);
+	ocl::net::basic_modem modem;
+	modem.construct<AF_INET, SOCK_STREAM, 8000>(ocl::net::basic_modem::local_address_ip4, true);
 
 	EXPECT_TRUE(modem.is_valid());
 
diff --git a/dev/tests/tracked_ptr_basic/tracked_ptr_test.cc b/dev/tests/tracked_ptr_basic/tracked_ptr_test.cc
index decae88..1e97188 100644
--- a/dev/tests/tracked_ptr_basic/tracked_ptr_test.cc
+++ b/dev/tests/tracked_ptr_basic/tracked_ptr_test.cc
@@ -10,16 +10,16 @@
 
 TEST(TrackedPtrTest, BasicTrackedPtrUsage)
 {
-	scl::memory::tracked_ptr<int> ptr = scl::memory::make_tracked<int>(42);
+	ocl::memory::tracked_ptr<int> ptr = ocl::memory::make_tracked<int>(42);
 
 	ASSERT_TRUE(ptr);
 	EXPECT_EQ(*ptr, 42);
 
-	scl::memory::tracked_ptr<int> ptr2;
+	ocl::memory::tracked_ptr<int> ptr2;
 
-	scl::memory::swap(ptr, ptr2);
+	ocl::memory::swap(ptr, ptr2);
 
 	ptr2.reset();
 
-	EXPECT_EQ(scl::memory::tracked_ptr<int>::manager().allocator().allocated_count_, 1);
+	EXPECT_EQ(ocl::memory::tracked_ptr<int>::manager().allocator().allocated_count_, 1);
 }
\ No newline at end of file
diff --git a/dev/tests/tracked_ptr_leak/tracked_ptr_test.cc b/dev/tests/tracked_ptr_leak/tracked_ptr_test.cc
index 375fb35..f349f47 100644
--- a/dev/tests/tracked_ptr_leak/tracked_ptr_test.cc
+++ b/dev/tests/tracked_ptr_leak/tracked_ptr_test.cc
@@ -10,10 +10,10 @@
 
 TEST(TrackedPtrTest, LeakTrackedPtrUsage)
 {
-	scl::memory::tracked_ptr<int>* ptr = new scl::memory::tracked_ptr<int>(42);
-	scl::memory::tracked_ptr<int>* ptr2 = new scl::memory::tracked_ptr<int>(42);
-	scl::memory::tracked_ptr<int>* ptr3 = new scl::memory::tracked_ptr<int>(42);
+	ocl::memory::tracked_ptr<int>* ptr = new ocl::memory::tracked_ptr<int>(42);
+	ocl::memory::tracked_ptr<int>* ptr2 = new ocl::memory::tracked_ptr<int>(42);
+	ocl::memory::tracked_ptr<int>* ptr3 = new ocl::memory::tracked_ptr<int>(42);
 
-	EXPECT_EQ(scl::memory::tracked_ptr<int>::manager().allocator().allocated_count_, 3);
-	ASSERT_TRUE(scl::memory::tracked_ptr<int>::manager().allocator().deallocated_count_ == 0);
+	EXPECT_EQ(ocl::memory::tracked_ptr<int>::manager().allocator().allocated_count_, 3);
+	ASSERT_TRUE(ocl::memory::tracked_ptr<int>::manager().allocator().deallocated_count_ == 0);
 }
\ No newline at end of file