Commit 9bccaa49 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'assignprop-typecheck' into 'master'

Implement type check in assignProperties()

See merge request !60
parents 59c40b49 0d4526ea
Pipeline #10594 passed with stage
in 4 minutes and 23 seconds
...@@ -261,9 +261,9 @@ void ResourceManager::assignProperties(typename std::conditional<Move, Propertie ...@@ -261,9 +261,9 @@ void ResourceManager::assignProperties(typename std::conditional<Move, Propertie
bool found = false; bool found = false;
for (auto it = dest.begin(); it != dest.end(); ++it) { for (auto it = dest.begin(); it != dest.end(); ++it) {
auto dstprop = *it; auto dstprop = *it;
if (dstprop->name() == srcprop->name()) if (dstprop->name() == srcprop->name()
&& dstprop->internal_type_name() == srcprop->internal_type_name())
{ {
// TODO: type check
out.push_back(dstprop); out.push_back(dstprop);
dest.erase(it); dest.erase(it);
if (Move) { if (Move) {
......
Markdown is supported
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