From ca7437f282cf77a0c7dd8ff8e908abd39dedeff7 Mon Sep 17 00:00:00 2001
From: Alberto Miranda <alberto.miranda@bsc.es>
Date: Tue, 14 Feb 2023 14:40:40 +0100
Subject: [PATCH] Rename admire_types.hpp to scord/types.hpp
---
examples/cxx/common.hpp | 2 +-
src/common/api/CMakeLists.txt | 2 +-
src/common/api/convert.hpp | 2 +-
src/common/api/{admire_types.hpp => scord/types.hpp} | 6 +++---
src/common/api/types.cpp | 2 +-
src/common/net/request.hpp | 2 +-
src/lib/CMakeLists.txt | 2 +-
src/lib/admire.h | 2 +-
src/lib/admire.hpp | 4 ++--
src/lib/c_wrapper.cpp | 2 +-
src/lib/detail/impl.cpp | 2 +-
src/scord-ctl/rpc_handlers.hpp | 2 +-
src/scord/adhoc_storage_manager.hpp | 2 +-
src/scord/job_manager.hpp | 2 +-
src/scord/pfs_storage_manager.hpp | 2 +-
src/scord/rpc_handlers.hpp | 2 +-
16 files changed, 19 insertions(+), 19 deletions(-)
rename src/common/api/{admire_types.hpp => scord/types.hpp} (99%)
diff --git a/examples/cxx/common.hpp b/examples/cxx/common.hpp
index ca08c7e5..38ffe7f0 100644
--- a/examples/cxx/common.hpp
+++ b/examples/cxx/common.hpp
@@ -2,7 +2,7 @@
#define SCORD_CXX_EXAMPLES_COMMON_HPP
#include <vector>
-#include <admire_types.hpp>
+#include <scord/types.hpp>
std::vector<admire::node>
prepare_nodes(size_t n);
diff --git a/src/common/api/CMakeLists.txt b/src/common/api/CMakeLists.txt
index b35531d5..01d93dd2 100644
--- a/src/common/api/CMakeLists.txt
+++ b/src/common/api/CMakeLists.txt
@@ -24,7 +24,7 @@
add_library(_api_types STATIC)
-target_sources(_api_types PUBLIC scord/types.h admire_types.hpp PRIVATE
+target_sources(_api_types PUBLIC scord/types.h scord/types.hpp PRIVATE
types.cpp convert.hpp convert.cpp internal_types.hpp errors.c)
target_include_directories(_api_types PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/common/api/convert.hpp b/src/common/api/convert.hpp
index 09e0c373..6189a5cb 100644
--- a/src/common/api/convert.hpp
+++ b/src/common/api/convert.hpp
@@ -26,7 +26,7 @@
#define SCORD_CONVERT_HPP
#include "scord/types.h"
-#include "admire_types.hpp"
+#include "scord/types.hpp"
namespace admire::api {
diff --git a/src/common/api/admire_types.hpp b/src/common/api/scord/types.hpp
similarity index 99%
rename from src/common/api/admire_types.hpp
rename to src/common/api/scord/types.hpp
index 65c95c97..98a1326a 100644
--- a/src/common/api/admire_types.hpp
+++ b/src/common/api/scord/types.hpp
@@ -22,8 +22,8 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*****************************************************************************/
-#ifndef SCORD_ADMIRE_TYPES_HPP
-#define SCORD_ADMIRE_TYPES_HPP
+#ifndef SCORD_TYPES_HPP
+#define SCORD_TYPES_HPP
#include <string>
#include <cstdint>
@@ -1041,4 +1041,4 @@ struct fmt::formatter<std::vector<admire::qos::limit>>
}
};
-#endif // SCORD_ADMIRE_TYPES_HPP
+#endif // SCORD_TYPES_HPP
diff --git a/src/common/api/types.cpp b/src/common/api/types.cpp
index 56f2a124..dda37ccf 100644
--- a/src/common/api/types.cpp
+++ b/src/common/api/types.cpp
@@ -28,7 +28,7 @@
#include <utility>
#include <variant>
#include <optional>
-#include "admire_types.hpp"
+#include "scord/types.hpp"
#include "internal_types.hpp"
/******************************************************************************/
diff --git a/src/common/net/request.hpp b/src/common/net/request.hpp
index 5c36cb88..84ead0d2 100644
--- a/src/common/net/request.hpp
+++ b/src/common/net/request.hpp
@@ -26,7 +26,7 @@
#define SCORD_NET_REQUEST_HPP
#include <thallium.hpp>
-#include "admire_types.hpp"
+#include <scord/types.hpp>
namespace scord::network {
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 6d5f7ed7..4ebb8683 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -32,7 +32,7 @@ target_sources(
list(APPEND public_headers "admire.h"
"${CMAKE_SOURCE_DIR}/src/common/api/scord/types.h" "admire.hpp"
- "${CMAKE_SOURCE_DIR}/src/common/api/admire_types.hpp"
+ "${CMAKE_SOURCE_DIR}/src/common/api/scord/types.hpp"
)
set_target_properties(libscord PROPERTIES PUBLIC_HEADER "${public_headers}")
diff --git a/src/lib/admire.h b/src/lib/admire.h
index b3b82f7b..b9991f27 100644
--- a/src/lib/admire.h
+++ b/src/lib/admire.h
@@ -44,7 +44,7 @@ extern "C" {
/* Public type definitions and type-related functions */
/******************************************************************************/
-// See types.h
+// See scord/types.h
/******************************************************************************/
diff --git a/src/lib/admire.hpp b/src/lib/admire.hpp
index a7106a9d..403f2e27 100644
--- a/src/lib/admire.hpp
+++ b/src/lib/admire.hpp
@@ -25,7 +25,7 @@
#include <admire.h>
#include <string>
#include <utility>
-#include "admire_types.hpp"
+#include "scord/types.hpp"
#include "net/proto/rpc_types.h"
#ifndef SCORD_ADMIRE_HPP
@@ -35,7 +35,7 @@
/* Public type definitions and type-related functions */
/******************************************************************************/
-// See admire_types.hpp
+// See scord/types.hpp
/******************************************************************************/
diff --git a/src/lib/c_wrapper.cpp b/src/lib/c_wrapper.cpp
index 72beff48..5a8a4b46 100644
--- a/src/lib/c_wrapper.cpp
+++ b/src/lib/c_wrapper.cpp
@@ -27,7 +27,7 @@
#include <logger/logger.hpp>
#include <net/proto/rpc_types.h>
#include <stdarg.h>
-#include <admire_types.hpp>
+#include <scord/types.hpp>
#include <scord/types.h>
#include <api/convert.hpp>
#include "detail/impl.hpp"
diff --git a/src/lib/detail/impl.cpp b/src/lib/detail/impl.cpp
index 67ab4a70..63f2ce93 100644
--- a/src/lib/detail/impl.cpp
+++ b/src/lib/detail/impl.cpp
@@ -27,7 +27,7 @@
#include <net/endpoint.hpp>
#include <net/request.hpp>
#include <net/serialization.hpp>
-#include <admire_types.hpp>
+#include <scord/types.hpp>
#include "impl.hpp"
using namespace std::literals;
diff --git a/src/scord-ctl/rpc_handlers.hpp b/src/scord-ctl/rpc_handlers.hpp
index 199ca912..a896d794 100644
--- a/src/scord-ctl/rpc_handlers.hpp
+++ b/src/scord-ctl/rpc_handlers.hpp
@@ -27,7 +27,7 @@
#include <net/request.hpp>
#include <net/serialization.hpp>
-#include <admire_types.hpp>
+#include <scord/types.hpp>
namespace scord::network::handlers {
diff --git a/src/scord/adhoc_storage_manager.hpp b/src/scord/adhoc_storage_manager.hpp
index 65d0a1f7..98c87e28 100644
--- a/src/scord/adhoc_storage_manager.hpp
+++ b/src/scord/adhoc_storage_manager.hpp
@@ -26,7 +26,7 @@
#ifndef SCORD_ADHOC_STORAGE_MANAGER_HPP
#define SCORD_ADHOC_STORAGE_MANAGER_HPP
-#include <admire_types.hpp>
+#include <scord/types.hpp>
#include <internal_types.hpp>
#include <utility>
#include <utils/utils.hpp>
diff --git a/src/scord/job_manager.hpp b/src/scord/job_manager.hpp
index 2c8ead05..df608331 100644
--- a/src/scord/job_manager.hpp
+++ b/src/scord/job_manager.hpp
@@ -25,7 +25,7 @@
#ifndef SCORD_JOB_MANAGER_HPP
#define SCORD_JOB_MANAGER_HPP
-#include <admire_types.hpp>
+#include <scord/types.hpp>
#include <internal_types.hpp>
#include <atomic>
#include <utility>
diff --git a/src/scord/pfs_storage_manager.hpp b/src/scord/pfs_storage_manager.hpp
index 48b31037..c71c1b8f 100644
--- a/src/scord/pfs_storage_manager.hpp
+++ b/src/scord/pfs_storage_manager.hpp
@@ -25,7 +25,7 @@
#ifndef SCORD_PFS_STORAGE_MANAGER_HPP
#define SCORD_PFS_STORAGE_MANAGER_HPP
-#include <admire_types.hpp>
+#include <scord/types.hpp>
#include <internal_types.hpp>
#include <utility>
#include <utils/utils.hpp>
diff --git a/src/scord/rpc_handlers.hpp b/src/scord/rpc_handlers.hpp
index d901fb39..880c6913 100644
--- a/src/scord/rpc_handlers.hpp
+++ b/src/scord/rpc_handlers.hpp
@@ -27,7 +27,7 @@
#include <net/request.hpp>
#include <net/serialization.hpp>
-#include <admire_types.hpp>
+#include <scord/types.hpp>
namespace scord::network::handlers {
--
GitLab