aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2018-06-04 14:46:14 +1000
committerNeil <nyamatongwe@gmail.com>2018-06-04 14:46:14 +1000
commitcc2ef371b2402396be6d5f5169e51e15dbd03a60 (patch)
tree27bdb057cbb0d1074149cb3a54811fa91519c247
parent13b2cba2ce2deb287d97a2d39e51d04934f55e91 (diff)
downloadscintilla-mirror-cc2ef371b2402396be6d5f5169e51e15dbd03a60.tar.gz
Reduce scope of captures for lambdas.
Use noexcept.
-rw-r--r--src/Decoration.cxx6
-rw-r--r--src/PerLine.cxx4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Decoration.cxx b/src/Decoration.cxx
index c5b00cbc1..2094bca1a 100644
--- a/src/Decoration.cxx
+++ b/src/Decoration.cxx
@@ -163,7 +163,7 @@ Decoration<POS> *DecorationList<POS>::Create(int indicator, Sci::Position length
template <typename POS>
void DecorationList<POS>::Delete(int indicator) {
decorationList.erase(std::remove_if(decorationList.begin(), decorationList.end(),
- [=](const std::unique_ptr<Decoration<POS>> &deco) {
+ [indicator](const std::unique_ptr<Decoration<POS>> &deco) {
return deco->Indicator() == indicator;
}), decorationList.end());
current = nullptr;
@@ -228,7 +228,7 @@ void DecorationList<POS>::DeleteRange(Sci::Position position, Sci::Position dele
template <typename POS>
void DecorationList<POS>::DeleteLexerDecorations() {
decorationList.erase(std::remove_if(decorationList.begin(), decorationList.end(),
- [=](const std::unique_ptr<Decoration<POS>> &deco) {
+ [](const std::unique_ptr<Decoration<POS>> &deco) {
return deco->Indicator() < INDIC_CONTAINER;
}), decorationList.end());
current = nullptr;
@@ -241,7 +241,7 @@ void DecorationList<POS>::DeleteAnyEmpty() {
decorationList.clear();
} else {
decorationList.erase(std::remove_if(decorationList.begin(), decorationList.end(),
- [=](const std::unique_ptr<Decoration<POS>> &deco) {
+ [](const std::unique_ptr<Decoration<POS>> &deco) {
return deco->Empty();
}), decorationList.end());
}
diff --git a/src/PerLine.cxx b/src/PerLine.cxx
index d76c01d54..3dfdffe5c 100644
--- a/src/PerLine.cxx
+++ b/src/PerLine.cxx
@@ -61,7 +61,7 @@ bool MarkerHandleSet::InsertHandle(int handle, int markerNum) {
}
void MarkerHandleSet::RemoveHandle(int handle) {
- mhList.remove_if([=](const MarkerHandleNumber &mhn) { return mhn.handle == handle; });
+ mhList.remove_if([handle](const MarkerHandleNumber &mhn) { return mhn.handle == handle; });
}
bool MarkerHandleSet::RemoveNumber(int markerNum, bool all) {
@@ -285,7 +285,7 @@ Sci::Line LineState::GetMaxLineState() const {
return static_cast<Sci::Line>(lineStates.Length());
}
-static int NumberLines(const char *text) {
+static int NumberLines(const char *text) noexcept {
if (text) {
int newLines = 0;
while (*text) {