Continuous integration on Travis #27
Merged
Conversation
This file contains 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
variable length array of non-POD element type for std::vector<cctag::ImageCut> vSelectedCuts[ numTags ]
| @@ -876,7 +876,7 @@ void cctagDetection(CCTag::List& markers, | |||
| } | |||
| #endif // WITH_CUDA | |||
|
|
|||
| std::vector<cctag::ImageCut> vSelectedCuts[ numTags ]; | |||
| std::vector<std::vector<cctag::ImageCut> > vSelectedCuts( numTags ); | |||
There was a problem hiding this comment.
@griwodz pls check if it is a safe change, clang was somehow complaining about making a c-array of vectors. It compiles after this but I hope there are not hidden side effects..
Conflicts: src/cctag/Detection.cpp
|
@lcalvet @griwodz @zvrba can someone check this (#27 (comment)) and merge? |
|
I've looked at the context (code around it in the file) and the change in the context looks fine. I'll merge it. |
|
thx! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
connected to #24