From 43fdade1984308a10c615949406d3f7317769f21 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 23 Jul 2021 15:06:40 +0200
Subject: [PATCH] WIP: fix enum
---
include/caosdb/transaction.h | 4 ++--
src/caosdb/transaction.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/caosdb/transaction.h b/include/caosdb/transaction.h
index b7d419b..8f606c6 100644
--- a/include/caosdb/transaction.h
+++ b/include/caosdb/transaction.h
@@ -54,7 +54,7 @@ private:
std::unique_ptr<Entity> entity;
};
-enum TransactionState { INIT = 10, EXECUTING = 20, SUCCESS = 30, ERROR = 40 };
+enum TransactionState { TS_INIT = 10, TS_EXECUTING = 20, TS_SUCCESS = 30, TS_ERROR = 40 };
/**
* @brief Create a transaction via `CaosDBConnection.createTransaction()`
@@ -62,7 +62,7 @@ enum TransactionState { INIT = 10, EXECUTING = 20, SUCCESS = 30, ERROR = 40 };
class Transaction {
private:
std::unique_ptr<ResultSet> result_set;
- TransactionState state = TransactionState::INIT;
+ TransactionState state = TransactionState::TS_INIT;
std::shared_ptr<EntityTransactionService::Stub> service_stub;
RetrieveRequest request; // TODO(tf)
diff --git a/src/caosdb/transaction.cpp b/src/caosdb/transaction.cpp
index 7adcb21..0c35784 100644
--- a/src/caosdb/transaction.cpp
+++ b/src/caosdb/transaction.cpp
@@ -57,7 +57,7 @@ auto Transaction::RetrieveById(const std::string &id) -> void {
auto Transaction::Execute() -> void {
// TODO(tf) throw error if not int INIT state
- this->state = TransactionState::EXECUTING;
+ this->state = TransactionState::TS_EXECUTING;
RetrieveResponse response;
grpc::ClientContext context;
--
GitLab