Skip to content
Snippets Groups Projects
Commit 549c9480 authored by Joscha Schmiedt's avatar Joscha Schmiedt
Browse files

Rename constants

parent ad54edbc
No related branches found
No related tags found
2 merge requests!61Release 0.3.0,!55Rename caosdb-cpplib to linkahead-cpplib
......@@ -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
......
......@@ -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.
......
......@@ -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;
......
......@@ -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";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment