From cab42b89ad55da8ee7198428c25ec08d34050b7b Mon Sep 17 00:00:00 2001 From: bubnikv Date: Wed, 4 Mar 2020 13:06:21 +0100 Subject: [PATCH] Fixed some compilation warnings. --- src/libslic3r/ExtrusionEntityCollection.hpp | 2 +- src/libslic3r/GCode/ToolOrdering.hpp | 8 -------- src/libslic3r/Print.hpp | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/libslic3r/ExtrusionEntityCollection.hpp b/src/libslic3r/ExtrusionEntityCollection.hpp index 271ac71f34..dfece6949b 100644 --- a/src/libslic3r/ExtrusionEntityCollection.hpp +++ b/src/libslic3r/ExtrusionEntityCollection.hpp @@ -106,7 +106,7 @@ public: double total_volume() const override { double volume=0.; for (const auto& ent : entities) volume+=ent->total_volume(); return volume; } // Following methods shall never be called on an ExtrusionEntityCollection. - Polyline as_polyline() const { + Polyline as_polyline() const override { throw std::runtime_error("Calling as_polyline() on a ExtrusionEntityCollection"); return Polyline(); }; diff --git a/src/libslic3r/GCode/ToolOrdering.hpp b/src/libslic3r/GCode/ToolOrdering.hpp index de0460f1b0..2252270d42 100644 --- a/src/libslic3r/GCode/ToolOrdering.hpp +++ b/src/libslic3r/GCode/ToolOrdering.hpp @@ -30,14 +30,6 @@ public: // When allocating extruder overrides of an object's ExtrusionEntity, overrides for maximum 3 copies are allocated in place. typedef boost::container::small_vector ExtruderPerCopy; - class ExtruderOverrides - { - public: - ExtruderOverrides(const ExtruderPerCopy *overrides, const int correct_extruder_id) : m_overrides(overrides) {} - private: - const ExtruderPerCopy *m_overrides; - }; - // This is called from GCode::process_layer - see implementation for further comments: const ExtruderPerCopy* get_extruder_overrides(const ExtrusionEntity* entity, int correct_extruder_id, size_t num_of_copies); diff --git a/src/libslic3r/Print.hpp b/src/libslic3r/Print.hpp index a239224262..1ff6e097b1 100644 --- a/src/libslic3r/Print.hpp +++ b/src/libslic3r/Print.hpp @@ -349,7 +349,7 @@ public: Print() = default; virtual ~Print() { this->clear(); } - PrinterTechnology technology() const noexcept { return ptFFF; } + PrinterTechnology technology() const noexcept override { return ptFFF; } // Methods, which change the state of Print / PrintObject / PrintRegion. // The following methods are synchronized with process() and export_gcode(),