ollien
/
advent-of-code-2020
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix warnings about iterating over string with wrong size type in day 14

master
Nick Krichevsky 2020-12-14 02:44:47 -05:00
parent 30a0e80114
commit bd820744c8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
day14/day14.cpp
View File

@ -29,7 +29,7 @@ class InstructionBlock {
long long maskValue(long long num) const { long long maskValue(long long num) const {
// We are dealing with a 36 bit numebr so we must use a long long to guarantee we can fit it // We are dealing with a 36 bit numebr so we must use a long long to guarantee we can fit it
long long res = num; long long res = num;
for (int i = 0; i < this->mask.size(); i++) { for (std::string::size_type i = 0; i < this->mask.size(); i++) {
char maskChar = this->mask.at(this->mask.size() - i - 1); char maskChar = this->mask.at(this->mask.size() - i - 1);
if (maskChar == IGNORE_CHAR) { if (maskChar == IGNORE_CHAR) {
continue; continue;
@ -84,10 +84,10 @@ class InstructionBlock {
* @param startIdx The index to start the search at * @param startIdx The index to start the search at
* @return std::vector<long long> All of the possible masked addresses * @return std::vector<long long> All of the possible masked addresses
*/ */
std::vector<long long> recursivelyMaskAddresses(long long address, int startIdx = 0) const { std::vector<long long> recursivelyMaskAddresses(long long address, std::string::size_type startIdx = 0) const {
std::vector<long long> results; std::vector<long long> results;
long long res = address; long long res = address;
for (int i = startIdx; i < this->mask.size(); i++) { for (std::string::size_type i = startIdx; i < this->mask.size(); i++) {
char maskChar = this->mask.at(this->mask.size() - i - 1); char maskChar = this->mask.at(this->mask.size() - i - 1);
if (maskChar == IGNORE_CHAR) { if (maskChar == IGNORE_CHAR) {
auto masked0 = this->setBitAt(res, i, '0'); auto masked0 = this->setBitAt(res, i, '0');