[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 920d32c 2/4: Avoid std::advance() and std::di
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 920d32c 2/4: Avoid std::advance() and std::distance() where unneeded |
Date: |
Sun, 22 Jan 2017 01:55:05 +0000 (UTC) |
branch: master
commit 920d32c80db70207973617b3460766cb2ea4f1b7
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Avoid std::advance() and std::distance() where unneeded
See:
http://lists.nongnu.org/archive/html/lmi/2017-01/msg00098.html
---
ihs_irc7702.cpp | 4 +---
multiple_cell_document.cpp | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ihs_irc7702.cpp b/ihs_irc7702.cpp
index 570466f..ac228cc 100644
--- a/ihs_irc7702.cpp
+++ b/ihs_irc7702.cpp
@@ -32,7 +32,6 @@
#include <algorithm>
#include <cmath>
#include <functional>
-#include <iterator> // std::advance()
#include <limits>
#include <numeric>
@@ -496,9 +495,8 @@ void Irc7702::InitCorridor()
( static_cast<unsigned int>(IssueAge)
<= CompleteGptCorridor().size()
);
- std::advance(corr, IssueAge);
GptCorridor.assign
- (corr
+ (corr + IssueAge
,CompleteGptCorridor().end()
);
}
diff --git a/multiple_cell_document.cpp b/multiple_cell_document.cpp
index acb34a2..09681fb 100644
--- a/multiple_cell_document.cpp
+++ b/multiple_cell_document.cpp
@@ -36,7 +36,6 @@
#include <iomanip>
#include <istream>
-#include <iterator> // std::distance()
#include <ostream>
#include <sstream>
#include <stdexcept>
@@ -154,7 +153,7 @@ void multiple_cell_document::parse(xml_lmi::dom_parser
const& parser)
: hurl<std::vector<Input> >("Unexpected element '" + tag + "'.")
);
xml::const_nodes_view const subelements(i.elements());
- v.reserve(std::distance(subelements.begin(), subelements.end()));
+ v.reserve(subelements.size());
for(auto const& j : subelements)
{
j >> cell;