Skip to content
Snippets Groups Projects
Verified Commit d166dc3a authored by Timm Fitschen's avatar Timm Fitschen
Browse files

REVERT: some style changes

parent aa12b35f
No related branches found
No related tags found
2 merge requests!61Release 0.3.0,!47F null pointer list users
Pipeline #47106 passed
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-julialib

#47122

    Pipeline: CaosDB Octave library

    #47121

      Pipeline: caosdb-cppinttest

      #47107

        Hide whitespace changes
        Inline Side-by-side
        include/caosdb/transaction_status.h
        + 1
        − 1
        View file @ d166dc3a
        ......@@ -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; \
        ......
        src/caosdb/configuration.cpp
        + 1
        − 1
        View file @ d166dc3a
        ......@@ -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."); \
        } \
        ......
        src/ccaosdb.cpp
        + 9
        − 9
        View file @ d166dc3a
        ......@@ -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;
        })
        ......
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment