From 16b9ac336b766f1fd394d77d40611a4875162930 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 1 Nov 2019 12:40:13 +1100 Subject: Backport: Avoid calling vector::shrink_to_fit in destructors as it is not noexcept. The destructors of the members will ensure that everything is correct. Potential unhandled exceptions reported by Coverity. Backport of changeset 7749:329a8e9986a0. --- src/CellBuffer.cxx | 1 - src/PerLine.cxx | 3 --- 2 files changed, 4 deletions(-) (limited to 'src') diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx index 48e986e43..3257e0e6b 100644 --- a/src/CellBuffer.cxx +++ b/src/CellBuffer.cxx @@ -98,7 +98,6 @@ public: void operator=(const LineStartIndex &) = delete; void operator=(LineStartIndex &&) = delete; virtual ~LineStartIndex() { - starts.DeleteAll(); } bool Allocate(Sci::Line lines) { refCount++; diff --git a/src/PerLine.cxx b/src/PerLine.cxx index 537512290..d81f46d3b 100644 --- a/src/PerLine.cxx +++ b/src/PerLine.cxx @@ -80,7 +80,6 @@ void MarkerHandleSet::CombineWith(MarkerHandleSet *other) { } LineMarkers::~LineMarkers() { - markers.DeleteAll(); } void LineMarkers::Init() { @@ -310,7 +309,6 @@ struct AnnotationHeader { }; LineAnnotation::~LineAnnotation() { - ClearAll(); } void LineAnnotation::Init() { @@ -433,7 +431,6 @@ int LineAnnotation::Lines(Sci::Line line) const { } LineTabstops::~LineTabstops() { - tabstops.DeleteAll(); } void LineTabstops::Init() { -- cgit v1.2.3