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

WIP: consolidation

parent 6a1eee8c
No related branches found
No related tags found
1 merge request!12F consolidation
......@@ -304,7 +304,7 @@ private:
*/
class Property {
public:
explicit inline Property(ProtoProperty *wrapped) : wrapped(wrapped) {
explicit inline Property(ProtoProperty *wrapped) : wrapped(wrapped), data_type(nullptr), value(nullptr) {
data_type.wrapped = this->wrapped->mutable_data_type();
value.wrapped = this->wrapped->mutable_value();
};
......@@ -449,9 +449,10 @@ class Entity {
public:
Entity();
inline Entity(const Entity &original)
: wrapped(CreateProtoEntity()), data_type(nullptr) {
: wrapped(CreateProtoEntity()), data_type(nullptr), value(nullptr) {
this->wrapped->CopyFrom(*original.wrapped);
data_type.wrapped = this->wrapped->mutable_data_type();
value.wrapped = this->wrapped->mutable_value();
properties.wrapped = this->wrapped->mutable_properties();
parents.wrapped = this->wrapped->mutable_parents();
errors.wrapped = CreateMessagesField();
......@@ -538,6 +539,7 @@ public:
auto SetValue(const Value &value) -> StatusCode;
auto SetValue(const std::string &value) -> StatusCode;
auto SetValue(const double value) -> StatusCode;
// TODO(tf)
// auto SetValue(const int64_t value) -> StatusCode;
// auto SetValue(const bool value) -> StatusCode;
......
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