tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix -Wshadow warnings 

Fix the GNU and CLang's -Wshadow warning by renaming the input parameters.
This commit is contained in:
Nemanja Trifunovic 2016-11-05 18:58:26 -04:00
parent 67036a031d
commit 5408022bd6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/utf8/checked.h
View File

@ -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 Permission is hereby granted, free of charge, to any person or organization
@ -41,7 +41,7 @@ namespace utf8
class invalid_code_point : public exception { class invalid_code_point : public exception {
uint32_t cp; uint32_t cp;
public: 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"; } virtual const char* what() const throw() { return "Invalid code point"; }
uint32_t code_point() const {return cp;} uint32_t code_point() const {return cp;}
}; };
@ -272,9 +272,9 @@ namespace utf8
public: public:
iterator () {} iterator () {}
explicit iterator (const octet_iterator& octet_it, explicit iterator (const octet_iterator& octet_it,
const octet_iterator& range_start, const octet_iterator& rangestart,
const octet_iterator& range_end) : const octet_iterator& rangeend) :
it(octet_it), range_start(range_start), range_end(range_end) it(octet_it), range_start(rangestart), range_end(rangeend)
{ {
if (it < range_start || it > range_end) if (it < range_start || it > range_end)
throw std::out_of_range("Invalid utf-8 iterator position"); throw std::out_of_range("Invalid utf-8 iterator position");