Fix compatibility issues with extract_features#3395
Merged
longjon merged 1 commit intoBVLC:masterfrom Dec 4, 2015
BonsaiAI:extract_features-compatibility
Merged
Fix compatibility issues with extract_features#3395longjon merged 1 commit intoBVLC:masterfrom BonsaiAI:extract_features-compatibility
longjon merged 1 commit intoBVLC:masterfrom
BonsaiAI:extract_features-compatibility
Conversation
tools/extract_features.cpp
Outdated
Contributor
There was a problem hiding this comment.
This probably should have just been int all along, yes? atoi returns int, the check below is currently bogus, and SetDevice expects int. And we generally don't use unsigned per Google style guide.
This is the only appearance of uint in Caffe; I wonder if it's a typo!
Contributor
Author
|
Updated to reflect @longjon's sensible remark. |
Contributor
|
Looks good, thanks @eelstork! |
longjon
added a commit
that referenced
this pull request
Dec 4, 2015
Fix compatibility issues with extract_features
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In some environments,
boost::shared_ptrmay conflict withstd(with C++ TR1 or C++11). Suggesting we avoid ambiguous notations in this case.uintis nonstandard.This PR addresses compatibility issues.