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

Merge branch 'dev' into f-value-and-unit

parents 28e440ba acdd1f0f
No related branches found
No related tags found
1 merge request!21BUG: remove FixValue, fix linting errors, move and complete get_status_description
Pipeline #12891 passed
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest

#12892

    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 3 additions and 0 deletions
    include/caosdb/entity.h
    + 3
    − 0
    View file @ 22e7156f
    ...@@ -599,6 +599,7 @@ public: ...@@ -599,6 +599,7 @@ public:
    value.wrapped = this->wrapped->mutable_value(); value.wrapped = this->wrapped->mutable_value();
    properties.wrapped = this->wrapped->mutable_properties(); properties.wrapped = this->wrapped->mutable_properties();
    parents.wrapped = this->wrapped->mutable_parents(); parents.wrapped = this->wrapped->mutable_parents();
    // FIXME(dh) copy messages?
    errors.wrapped = CreateMessagesField(); errors.wrapped = CreateMessagesField();
    warnings.wrapped = CreateMessagesField(); warnings.wrapped = CreateMessagesField();
    infos.wrapped = CreateMessagesField(); infos.wrapped = CreateMessagesField();
    ...@@ -611,6 +612,7 @@ public: ...@@ -611,6 +612,7 @@ public:
    value.wrapped = this->wrapped->mutable_value(); value.wrapped = this->wrapped->mutable_value();
    properties.wrapped = this->wrapped->mutable_properties(); properties.wrapped = this->wrapped->mutable_properties();
    parents.wrapped = this->wrapped->mutable_parents(); parents.wrapped = this->wrapped->mutable_parents();
    // FIXME(dh) copy messages?
    errors.wrapped = CreateMessagesField(); errors.wrapped = CreateMessagesField();
    warnings.wrapped = CreateMessagesField(); warnings.wrapped = CreateMessagesField();
    infos.wrapped = CreateMessagesField(); infos.wrapped = CreateMessagesField();
    ...@@ -648,6 +650,7 @@ public: ...@@ -648,6 +650,7 @@ public:
    return this->warnings.wrapped->size() > 0; return this->warnings.wrapped->size() > 0;
    } }
    [[nodiscard]] auto GetInfos() const -> const Messages & { return infos; } [[nodiscard]] auto GetInfos() const -> const Messages & { return infos; }
    [[nodiscard]] inline auto HasInfos() const -> bool { return this->infos.wrapped->size() > 0; }
    inline auto ToString() const -> const std::string { inline auto ToString() const -> const std::string {
    google::protobuf::util::JsonPrintOptions options; google::protobuf::util::JsonPrintOptions options;
    ......
    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