Skip to content

Fixes warnings/errors for 32-bit (and maybe ILP64?) builds #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abarnert-pg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes warnings/errors for 32-bit (and maybe ILP64?) builds #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion containers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ packToken TokenList::default_constructor(TokenMap scope) {

packToken* TokenList::ListIterator::next() {
if (i < list->size()) {
return &list->at(i++);
TokenList_t::size_type idx = TokenList_t::size_type(i++);
return &list->at(idx);
} else {
i = 0;
return NULL;
Expand Down
3 changes: 2 additions & 1 deletion containers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ struct TokenList : public Container<TokenList_t>, public Iterable {
if (list().size() <= idx) {
throw std::out_of_range("List index out of range!");
}
return list()[idx];
TokenList_t::size_type i = TokenList_t::size_type(idx);
return list()[i];
}

void push(packToken val) const { list().push_back(val); }
Expand Down