diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-11-05 16:13:11 +0000 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-11-05 16:13:11 +0000 |
commit | 6f31e94a14552e956c4758549d5c8889a9c86d61 (patch) | |
tree | 235c54462e13f3c38c065e5801f836a1933076ba | |
parent | Standalone split (diff) | |
download | project2-6f31e94a14552e956c4758549d5c8889a9c86d61.tar.bz2 project2-6f31e94a14552e956c4758549d5c8889a9c86d61.tar.xz project2-6f31e94a14552e956c4758549d5c8889a9c86d61.zip |
Slicer 1.7 compatibility
-rw-r--r-- | project2/ice/iceRows.cpp | 4 | ||||
-rw-r--r-- | project2/ice/iceViewSerializer.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/project2/ice/iceRows.cpp b/project2/ice/iceRows.cpp index 3748512..88917d2 100644 --- a/project2/ice/iceRows.cpp +++ b/project2/ice/iceRows.cpp @@ -51,7 +51,7 @@ class IceRowState : public RowState { void AssignFieldValue(FieldValues::iterator & field, ModelPartPtr domp) { if (domp) { - domp->GetValue(new Assign(*field)); + domp->GetValue(Assign(*field)); } field++; } @@ -70,7 +70,7 @@ void RowProcSerializer::Serialize(ModelPartForRootPtr mp) { if (mp) { - mp->OnEachChild([this](const std::string &, ModelPartPtr mp, HookCommonPtr) { + mp->OnEachChild([this](const std::string &, ModelPartPtr mp, const HookCommon *) { switch (mp->GetType()) { case mpt_Null: return; diff --git a/project2/ice/iceViewSerializer.cpp b/project2/ice/iceViewSerializer.cpp index 7651fc1..4c68d3c 100644 --- a/project2/ice/iceViewSerializer.cpp +++ b/project2/ice/iceViewSerializer.cpp @@ -36,7 +36,7 @@ IceViewSerializer::addNamedValue(const Glib::ustring & name, const VariableType if (rowmpp) { ModelPartPtr field = rowmpp->GetChild(name); if (field) { - field->SetValue(new Assign(vt)); + field->SetValue(Assign(vt)); } else { Logger()->messagebf(LOG_INFO, "%s: Field not found", __PRETTY_FUNCTION__); |