From 549c9480a0804fc14031022f2901f8c4a13a6633 Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <joscha@schmiedt.dev>
Date: Sat, 31 Aug 2024 22:34:03 +0200
Subject: [PATCH] Rename constants
---
include/linkahead/connection.h | 24 ++++++++++++------------
include/linkahead/constants.h.in | 14 +++++++-------
test/test_protobuf.cpp | 2 +-
test/test_transaction.cpp | 2 +-
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/include/linkahead/connection.h b/include/linkahead/connection.h
index ac21b5a..21e92b1 100644
--- a/include/linkahead/connection.h
+++ b/include/linkahead/connection.h
@@ -31,18 +31,18 @@
#include "linkahead/acm/user.h" // for User
#include "caosdb/acm/v1alpha1/main.grpc.pb.h" // for AccessControlMan...
#endif
-#include "linkahead/authentication.h" // for Authenticator
-#include "linkahead/configuration.h" // for ConnectionConfigura...
-#include "caosdb/entity/v1/main.pb.h" // for EntityTransactionSe...
-#include "linkahead/info.h" // for VersionInfo
-#include "caosdb/info/v1/main.grpc.pb.h" // for GeneralInfoService:...
-#include "linkahead/transaction.h" // for Transaction
-#include "linkahead/transaction_status.h" // for TransactionStatus
-#include <filesystem> // for path
-#include <grpcpp/channel.h> // for Channel
-#include <map> // for map
-#include <memory> // for shared_ptr, unique_ptr
-#include <string> // for string, basic_string
+#include "linkahead/authentication.h" // for Authenticator
+#include "linkahead/configuration.h" // for ConnectionConfigura...
+#include "caosdb/entity/v1/main.grpc.pb.h" // for EntityTransactionSe...
+#include "linkahead/info.h" // for VersionInfo
+#include "caosdb/info/v1/main.grpc.pb.h" // for GeneralInfoService:...
+#include "linkahead/transaction.h" // for Transaction
+#include "linkahead/transaction_status.h" // for TransactionStatus
+#include <filesystem> // for path
+#include <grpcpp/channel.h> // for Channel
+#include <map> // for map
+#include <memory> // for shared_ptr, unique_ptr
+#include <string> // for string, basic_string
#ifdef BUILD_ACM
#include <vector> // for vector
#endif
diff --git a/include/linkahead/constants.h.in b/include/linkahead/constants.h.in
index e4304ea..f445455 100644
--- a/include/linkahead/constants.h.in
+++ b/include/linkahead/constants.h.in
@@ -29,13 +29,13 @@
namespace linkahead {
#endif
// clang-format off
-static const int LIBCAOSDB_VERSION_MAJOR = @libcaosdb_VERSION_MAJOR@;
-static const int LIBCAOSDB_VERSION_MINOR = @libcaosdb_VERSION_MINOR@;
-static const int LIBCAOSDB_VERSION_PATCH = @libcaosdb_VERSION_PATCH@;
-static const int COMPATIBLE_SERVER_VERSION_MAJOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR@;
-static const int COMPATIBLE_SERVER_VERSION_MINOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR@;
-static const int COMPATIBLE_SERVER_VERSION_PATCH = @libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH@;
-__attribute__((unused)) static const char* COMPATIBLE_SERVER_VERSION_PRE_RELEASE = "@libcaosdb_COMPATIBLE_SERVER_VERSION_PRE_RELEASE@";
+static const int LIBCAOSDB_VERSION_MAJOR = @liblinkahead_VERSION_MAJOR@;
+static const int LIBCAOSDB_VERSION_MINOR = @liblinkahead_VERSION_MINOR@;
+static const int LIBCAOSDB_VERSION_PATCH = @liblinkahead_VERSION_PATCH@;
+static const int COMPATIBLE_SERVER_VERSION_MAJOR = @liblinkahead_COMPATIBLE_SERVER_VERSION_MAJOR@;
+static const int COMPATIBLE_SERVER_VERSION_MINOR = @liblinkahead_COMPATIBLE_SERVER_VERSION_MINOR@;
+static const int COMPATIBLE_SERVER_VERSION_PATCH = @liblinkahead_COMPATIBLE_SERVER_VERSION_PATCH@;
+__attribute__((unused)) static const char* COMPATIBLE_SERVER_VERSION_PRE_RELEASE = "@liblinkahead_COMPATIBLE_SERVER_VERSION_PRE_RELEASE@";
/**
* Precedence of configuration files from highest to lowest.
diff --git a/test/test_protobuf.cpp b/test/test_protobuf.cpp
index ed9fbf1..adfd5e5 100644
--- a/test/test_protobuf.cpp
+++ b/test/test_protobuf.cpp
@@ -31,9 +31,9 @@
namespace caosdb {
using ProtoEntity = caosdb::entity::v1::Entity;
-using linkahead::entity::Entity;
using caosdb::entity::v1::Message;
using google::protobuf::Arena;
+using linkahead::entity::Entity;
TEST(test_protobuf, test_swap_trivial) {
Arena arena;
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index 666775e..1e96ef7 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -47,8 +47,8 @@ using linkahead::connection::Connection;
using linkahead::entity::Entity;
using linkahead::exceptions::ConnectionError;
using ProtoEntity = caosdb::entity::v1::Entity;
-using linkahead::entity::Role;
using caosdb::entity::v1::RetrieveResponse;
+using linkahead::entity::Role;
TEST(test_transaction, create_transaction) {
const auto *host = "localhost";
--
GitLab