search

blueboy / portal

This portal repo is for development purposes only
http://github.com/blueboy/portal
GNU General Public License v2.0
27 stars 24 forks source link

fixed infinite loop at retrieving characters #74

Closed UltimateTomatoes closed 9 years ago

UltimateTomatoes commented 9 years ago

had to replace the NULL that i had replaced with nullptr in CharacterHandler.cpp. sql statments must have NULL not nullptr.....

cala commented 9 years ago

Thanks. I added the nullptr to NULL fixes along with the VC140 support. I notice that your PR has 3 commits, while it should only have one (the nullptr to NULL). I assume that your fork of portal is slightly out of sync. It may come from both of us pushing the same commits about at the same time. You may then need to fork it anew. To avoid this in the future, I suggest that you use topic branch everytime you want to do a pull request, thus if the PR is not merged or modified before merging, you won't have to fork anew the whole repository (deleting a branch is far more easy). :smile: