Skip to content
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.

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

allow gcc 4.8 to compile kenlm #6

Merged
merged 1 commit into from
Jun 4, 2013
Merged

allow gcc 4.8 to compile kenlm #6

merged 1 commit into from
Jun 4, 2013

Conversation

graehl
Copy link
Contributor

@graehl graehl commented Jun 4, 2013

make ProxyIterator::reference a reference (not a value) in order to truly
satisfy random access iterator requirements, because std algs were trying to
std::swap rvalues

added swap(ProxyIterator &,ProxyIterator &) and (shallow) swap of
SizedProxy.Inner() to go with existing deep swap for SizedProxy; I know there
are other ProxyIterators but the code I'm building doesn't need swap for
those. added a //TODO: comment with a concern I have about SizedProxy's deep
swap (which was only recently added); I (graehl) don't understand kenlm well
enough to judge.

avoid some new gcc 4.8 warnings

made compile_query_only.sh respect CXX env var

make ProxyIterator::reference a reference (not a value) in order to truly
satisfy random access iterator requirements, because std algs were trying to
std::swap rvalues

added swap(ProxyIterator &,ProxyIterator &) and (shallow) swap of
SizedProxy.Inner() to go with existing deep swap for SizedProxy; I know there
are other ProxyIterators but the code I'm building doesn't need swap for
those. added a //TODO: comment with a concern I have about SizedProxy's deep
swap (which was only recently added); I (graehl) don't understand KenLM well
enough to judge.

avoid some new gcc 4.8 warnings

made compile_query_only.sh respect CXX env var
kpu added a commit that referenced this pull request Jun 4, 2013
allow gcc 4.8 to compile kenlm
@kpu kpu merged commit e7830b9 into kpu:master Jun 4, 2013
@cffan cffan mentioned this pull request Sep 26, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants