From 5408022bd69cb0a0a792ed13747743d1410f6e18 Mon Sep 17 00:00:00 2001 From: Nemanja Trifunovic Date: Sat, 5 Nov 2016 18:58:26 -0400 Subject: [PATCH] Fix -Wshadow warnings Fix the GNU and CLang's -Wshadow warning by renaming the input parameters. --- source/utf8/checked.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/utf8/checked.h b/source/utf8/checked.h index cc1ec4777..2aef5838d 100644 --- a/source/utf8/checked.h +++ b/source/utf8/checked.h @@ -1,4 +1,4 @@ -// Copyright 2006 Nemanja Trifunovic +// Copyright 2006-2016 Nemanja Trifunovic /* Permission is hereby granted, free of charge, to any person or organization @@ -41,7 +41,7 @@ namespace utf8 class invalid_code_point : public exception { uint32_t cp; public: - invalid_code_point(uint32_t cp) : cp(cp) {} + invalid_code_point(uint32_t codepoint) : cp(codepoint) {} virtual const char* what() const throw() { return "Invalid code point"; } uint32_t code_point() const {return cp;} }; @@ -272,9 +272,9 @@ namespace utf8 public: iterator () {} explicit iterator (const octet_iterator& octet_it, - const octet_iterator& range_start, - const octet_iterator& range_end) : - it(octet_it), range_start(range_start), range_end(range_end) + const octet_iterator& rangestart, + const octet_iterator& rangeend) : + it(octet_it), range_start(rangestart), range_end(rangeend) { if (it < range_start || it > range_end) throw std::out_of_range("Invalid utf-8 iterator position");