From d166dc3a85f305aeee358674ed7fe11bddbd1835 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 9 Feb 2024 09:33:48 +0100
Subject: [PATCH] REVERT: some style changes
---
include/caosdb/transaction_status.h | 2 +-
src/caosdb/configuration.cpp | 2 +-
src/ccaosdb.cpp | 18 +++++++++---------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/caosdb/transaction_status.h b/include/caosdb/transaction_status.h
index 56bd55b..d46f391 100644
--- a/include/caosdb/transaction_status.h
+++ b/include/caosdb/transaction_status.h
@@ -40,7 +40,7 @@ using caosdb::exceptions::TransactionTypeError;
* Define static factory method in the TransactionStatus class.
*/
#define CAOSDB_TRANSACTION_STATUS_DEFAULT_FACTORY(_StatusName, _StatusCode) \
- inline static auto _StatusName() -> const TransactionStatus & { \
+ inline static auto _StatusName()->const TransactionStatus & { \
static const TransactionStatus instance(_StatusCode, \
caosdb::get_status_description(_StatusCode)); \
return instance; \
diff --git a/src/caosdb/configuration.cpp b/src/caosdb/configuration.cpp
index 8fbf9fe..e1ffb23 100644
--- a/src/caosdb/configuration.cpp
+++ b/src/caosdb/configuration.cpp
@@ -55,7 +55,7 @@
throw ConfigurationError("This CaosDB client has not been configured."); \
} \
assert(WRAPPED_JSON_CONFIGURATION(this)->is_object()); \
- const auto &configuration = WRAPPED_JSON_CONFIGURATION(this) -> as_object(); \
+ const auto &configuration = WRAPPED_JSON_CONFIGURATION(this)->as_object(); \
if (!configuration.contains("connections")) { \
throw ConfigurationError("This CaosDB client hasn't any configured connections."); \
} \
diff --git a/src/ccaosdb.cpp b/src/ccaosdb.cpp
index 82bcbae..ae1a728 100644
--- a/src/ccaosdb.cpp
+++ b/src/ccaosdb.cpp
@@ -83,7 +83,7 @@ extern "C" {
auto *wrapped_entity = WRAPPED_ENTITY_CAST(entity); \
auto *tmp = (char *)malloc(sizeof(char) * wrapped_entity->GetFunction.length() + 1); \
strcpy(tmp, wrapped_entity->GetFunction.c_str()); \
- delete[] *out; \
+ delete[] * out; \
*out = tmp; \
return 0; \
})
@@ -109,7 +109,7 @@ extern "C" {
auto *wrapped_property = WRAPPED_PROPERTY_CAST(property); \
auto *tmp = (char *)malloc(sizeof(char) * wrapped_property->GetFunction.length() + 1); \
strcpy(tmp, wrapped_property->GetFunction.c_str()); \
- delete[] *out; \
+ delete[] * out; \
*out = tmp; \
return 0; \
})
@@ -136,7 +136,7 @@ extern "C" {
auto *wrapped_parent = WRAPPED_PARENT_CAST(parent); \
auto *tmp = (char *)malloc(sizeof(char) * wrapped_parent->GetFunction.length() + 1); \
strcpy(tmp, wrapped_parent->GetFunction.c_str()); \
- delete[] *out; \
+ delete[] * out; \
*out = tmp; \
return 0; \
})
@@ -729,7 +729,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
std::string role_str = ENUM_NAME_FROM_VALUE(wrapped_entity->GetRole(), Role);
auto *tmp = (char *)malloc(sizeof(char) * role_str.length() + 1);
strcpy(tmp, role_str.c_str());
- delete[] *out;
+ delete[] * out;
*out = tmp;
return 0;
})
@@ -741,7 +741,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
auto path = wrapped_entity->GetLocalPath().string();
auto *tmp = (char *)(malloc(sizeof(char) * path.length() + 1));
strcpy(tmp, path.c_str());
- delete[] *out;
+ delete[] * out;
*out = tmp;
return 0;
})
@@ -887,7 +887,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
ENUM_NAME_FROM_VALUE(wrapped_property->GetImportance(), Importance);
char *tmp = (char *)malloc(sizeof(char) * importance_str.length() + 1);
strcpy(tmp, importance_str.c_str());
- delete[] *out;
+ delete[] * out;
*out = tmp;
return 0;
})
@@ -925,7 +925,7 @@ ERROR_RETURN_CODE(
auto *wrapped_message = static_cast<caosdb::entity::Message *>(message->wrapped_message);
auto *tmp = (char *)malloc(sizeof(char) * wrapped_message->GetDescription().length() + 1);
strcpy(tmp, wrapped_message->GetDescription().c_str());
- delete[] *out;
+ delete[] * out;
*out = tmp;
return 0;
})
@@ -1000,7 +1000,7 @@ ERROR_RETURN_CODE(
}
char *tmp = (char *)malloc(sizeof(char) * datatype_name.length() + 1);
strcpy(tmp, datatype_name.c_str());
- delete[] *out;
+ delete[] * out;
*out = tmp;
return 0;
})
@@ -1018,7 +1018,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
auto *tmp =
(char *)malloc(sizeof(char) * wrapped_value->GetAsString().length() + 1);
strcpy(tmp, wrapped_value->GetAsString().c_str());
- delete[] *out;
+ delete[] * out;
*out = tmp;
return 0;
})
--
GitLab