Rename constants

include/linkahead/connection.h

@@ -33,7 +33,7 @@
 #endif
 #include "linkahead/authentication.h" // for Authenticator
 #include "linkahead/configuration.h"  // for ConnectionConfigura...
-#include "caosdb/entity/v1/main.pb.h"     // for EntityTransactionSe...
+#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/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.

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;

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";