History

fixing ambiguous "call to overloaded function compiler" errors on windows and linux builds

ericrius1 committed 11 years ago

Commit e36099f1 parent e4ff3fa1 file · +6 −6Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+6−6
@@ -500,7 +500,7 @@ bool EntityScriptingInterface::setPoints(QUuid entityID, std::function<bool(Poly · 499 unmodified lines
500500
501501 EntityTypes::EntityType entityType = entity->getType();
502502
503− if (entityType != EntityTypes::Line) {
503+ if (entityType != EntityTypes::PolyLine) {
504504 return false;
505505 }
506506
@@ -554,14 +554,14 @@ bool EntityScriptingInterface::setAllPoints(QUuid entityID, const QVector<glm::v · 47 unmodified lines
554554 if (entityType == EntityTypes::Line) {
555555 return setPoints(entityID, [points](LineEntityItem& lineEntity) -> bool
556556 {
557− return lineEntity.setLinePoints(points);
557+ return (LineEntityItem*)lineEntity.setLinePoints(points);
558558 });
559559 }
560560
561561 if (entityType == EntityTypes::PolyLine) {
562− return setPoints(entityID, [points](PolyLineEntityItem& PolyLineEntity) -> bool
562+ return setPoints(entityID, [points](PolyLineEntityItem& polyLineEntity) -> bool
563563 {
564− return PolyLineEntity.setLinePoints(points);
564+ return (PolyLineEntityItem*)polyLineEntity.setLinePoints(points);
565565 });
566566 }
567567
@@ -579,14 +579,14 @@ bool EntityScriptingInterface::appendPoint(QUuid entityID, const glm::vec3& poin · 11 unmodified lines
579579 if (entityType == EntityTypes::Line) {
580580 return setPoints(entityID, [point](LineEntityItem& lineEntity) -> bool
581581 {
582− return lineEntity.appendPoint(point);
582+ return (LineEntityItem*)lineEntity.appendPoint(point);
583583 });
584584 }
585585
586586 if (entityType == EntityTypes::PolyLine) {
587587 return setPoints(entityID, [point](PolyLineEntityItem& PolyLineEntity) -> bool
588588 {
589− return PolyLineEntity.appendPoint(point);
589+ return (PolyLineEntityItem*)PolyLineEntity.appendPoint(point);
590590 });
591591 }
592592