From 986581ed3aabd4b6c54aea8309d39bf2ed0230d4 Mon Sep 17 00:00:00 2001
From: Alberto Miranda <alberto.miranda@bsc.es>
Date: Fri, 4 Dec 2020 20:48:55 +0100
Subject: [PATCH] Rename: chunk_calc_util.hpp -> arithmetic.hpp
---
.../arithmetic/{chunk_calc_util.hpp => arithmetic.hpp} | 6 +++---
src/client/rpc/forward_data.cpp | 2 +-
src/daemon/handler/srv_data.cpp | 2 +-
src/daemon/ops/data.cpp | 2 +-
src/global/arithmetic/CMakeLists.txt | 4 ++--
tests/unit/test_utils_arithmetic.cpp | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
rename include/global/arithmetic/{chunk_calc_util.hpp => arithmetic.hpp} (98%)
diff --git a/include/global/arithmetic/chunk_calc_util.hpp b/include/global/arithmetic/arithmetic.hpp
similarity index 98%
rename from include/global/arithmetic/chunk_calc_util.hpp
rename to include/global/arithmetic/arithmetic.hpp
index 5d5314a9c..be603d67e 100644
--- a/include/global/arithmetic/chunk_calc_util.hpp
+++ b/include/global/arithmetic/arithmetic.hpp
@@ -11,8 +11,8 @@
SPDX-License-Identifier: MIT
*/
-#ifndef GEKKOFS_CHNK_CALC_UTIL_HPP
-#define GEKKOFS_CHNK_CALC_UTIL_HPP
+#ifndef GKFS_GLOBAL_ARITHMETIC_HPP
+#define GKFS_GLOBAL_ARITHMETIC_HPP
#include <cstdint>
#include <unistd.h>
@@ -200,4 +200,4 @@ chnk_count_for_offset(const uint64_t offset, const size_t count,
} // namespace gkfs::utils::arithmetic
-#endif
+#endif // GKFS_GLOBAL_ARITHMETIC_HPP
\ No newline at end of file
diff --git a/src/client/rpc/forward_data.cpp b/src/client/rpc/forward_data.cpp
index 5637c6e67..05964abcc 100644
--- a/src/client/rpc/forward_data.cpp
+++ b/src/client/rpc/forward_data.cpp
@@ -17,7 +17,7 @@
#include <client/logging.hpp>
#include <global/rpc/distributor.hpp>
-#include <global/arithmetic/chunk_calc_util.hpp>
+#include <global/arithmetic/arithmetic.hpp>
#include <unordered_set>
diff --git a/src/daemon/handler/srv_data.cpp b/src/daemon/handler/srv_data.cpp
index 8446f2388..027955c25 100644
--- a/src/daemon/handler/srv_data.cpp
+++ b/src/daemon/handler/srv_data.cpp
@@ -20,7 +20,7 @@
#include <global/rpc/rpc_types.hpp>
#include <global/rpc/distributor.hpp>
-#include <global/arithmetic/chunk_calc_util.hpp>
+#include <global/arithmetic/arithmetic.hpp>
#ifdef GKFS_ENABLE_AGIOS
#include <daemon/scheduler/agios.hpp>
diff --git a/src/daemon/ops/data.cpp b/src/daemon/ops/data.cpp
index 5e5a4bdc6..7eed27f93 100644
--- a/src/daemon/ops/data.cpp
+++ b/src/daemon/ops/data.cpp
@@ -13,7 +13,7 @@
#include <daemon/ops/data.hpp>
#include <daemon/backend/data/chunk_storage.hpp>
-#include <global/arithmetic/chunk_calc_util.hpp>
+#include <global/arithmetic/arithmetic.hpp>
#include <utility>
extern "C" {
diff --git a/src/global/arithmetic/CMakeLists.txt b/src/global/arithmetic/CMakeLists.txt
index 186a0c9c1..16c35079c 100644
--- a/src/global/arithmetic/CMakeLists.txt
+++ b/src/global/arithmetic/CMakeLists.txt
@@ -14,10 +14,10 @@
add_library(arithmetic INTERFACE)
target_sources(arithmetic
INTERFACE
- ${INCLUDE_DIR}/global/arithmetic/chunk_calc_util.hpp
+ ${INCLUDE_DIR}/global/arithmetic/arithmetic.hpp
)
target_include_directories(arithmetic
INTERFACE
${INCLUDE_DIR}/global/arithmetic/
- )
\ No newline at end of file
+ )
diff --git a/tests/unit/test_utils_arithmetic.cpp b/tests/unit/test_utils_arithmetic.cpp
index 0d7d970f1..cc21f763b 100644
--- a/tests/unit/test_utils_arithmetic.cpp
+++ b/tests/unit/test_utils_arithmetic.cpp
@@ -12,8 +12,8 @@
*/
#include <catch2/catch.hpp>
-#include <global/arithmetic/chunk_calc_util.hpp>
#include <fmt/format.h>
+#include <arithmetic.hpp>
using namespace gkfs::utils::arithmetic;
constexpr auto test_reps = 200u;
--
GitLab