From 1bd42ee98eff237cbc8e3856aa1e63ef5bc5b64a Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sun, 28 Jan 2018 09:10:00 +1100
Subject: Use std::end when filling arrays as reduces chance of mistake.

---
 src/PositionCache.cxx | 5 +++--
 src/RESearch.cxx      | 7 ++++---
 src/XPM.cxx           | 4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx
index 0b563f525..99e3c4d56 100644
--- a/src/PositionCache.cxx
+++ b/src/PositionCache.cxx
@@ -14,6 +14,7 @@
 #include <vector>
 #include <map>
 #include <algorithm>
+#include <iterator>
 #include <memory>
 
 #include "Platform.h"
@@ -378,7 +379,7 @@ static inline int KeyFromString(const char *charBytes, size_t len) {
 }
 
 SpecialRepresentations::SpecialRepresentations() {
-	std::fill(startByteHasReprs, startByteHasReprs+0x100, static_cast<short>(0));
+	std::fill(startByteHasReprs, std::end(startByteHasReprs), static_cast<short>(0));
 }
 
 void SpecialRepresentations::SetRepresentation(const char *charBytes, const char *value) {
@@ -419,7 +420,7 @@ bool SpecialRepresentations::Contains(const char *charBytes, size_t len) const {
 
 void SpecialRepresentations::Clear() {
 	mapReprs.clear();
-	std::fill(startByteHasReprs, startByteHasReprs+0x100, static_cast<short>(0));
+	std::fill(startByteHasReprs, std::end(startByteHasReprs), static_cast<short>(0));
 }
 
 void BreakFinder::Insert(int val) {
diff --git a/src/RESearch.cxx b/src/RESearch.cxx
index 31ee9aaac..f7ae04974 100644
--- a/src/RESearch.cxx
+++ b/src/RESearch.cxx
@@ -205,6 +205,7 @@
 #include <stdexcept>
 #include <string>
 #include <algorithm>
+#include <iterator>
 
 #include "Position.h"
 #include "CharClassify.h"
@@ -254,9 +255,9 @@ RESearch::RESearch(CharClassify *charClassTable) {
 	charClass = charClassTable;
 	sta = NOP;                  /* status of lastpat */
 	bol = 0;
-	std::fill(bittab, bittab + BITBLK, static_cast<unsigned char>(0));
-	std::fill(tagstk, tagstk + MAXTAG, 0);
-	std::fill(nfa, nfa + MAXNFA, '\0');
+	std::fill(bittab, std::end(bittab), static_cast<unsigned char>(0));
+	std::fill(tagstk, std::end(tagstk), 0);
+	std::fill(nfa, std::end(nfa), '\0');
 	Clear();
 }
 
diff --git a/src/XPM.cxx b/src/XPM.cxx
index 0f314f35f..35bfc79aa 100644
--- a/src/XPM.cxx
+++ b/src/XPM.cxx
@@ -11,6 +11,8 @@
 #include <stdexcept>
 #include <vector>
 #include <map>
+#include <algorithm>
+#include <iterator>
 #include <memory>
 
 #include "Platform.h"
@@ -87,7 +89,7 @@ void XPM::Init(const char *const *linesForm) {
 	if (!linesForm)
 		return;
 
-	std::fill(colourCodeTable, colourCodeTable+256, 0);
+	std::fill(colourCodeTable, std::end(colourCodeTable), 0);
 	const char *line0 = linesForm[0];
 	width = atoi(line0);
 	line0 = NextField(line0);
-- 
cgit v1.2.3