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

integration branch does not compile #136

Merged
merged 1 commit into from
Nov 16, 2012
Merged

integration branch does not compile #136

merged 1 commit into from
Nov 16, 2012

Conversation

wichert
Copy link
Contributor

@wichert wichert commented Nov 16, 2012

I wanted to try your fix for #5, but the current single include from the integration branch does not compile for me:

../../include/catch/catch.hpp: In instantiation of ‘Catch::ExpressionLhs<const unsigned int&>’:
../../src/tests/article.cc:15:   instantiated from here
../../include/catch/catch.hpp:942: error: forming reference to reference type ‘const unsigned int&’
../../include/catch/catch.hpp: In member function ‘Catch::ExpressionLhs<const T&> Catch::ExpressionDecomposer::operator->*(const T&) [with T = unsigned int]’:
../../src/tests/article.cc:15:   instantiated from here
../../include/catch/catch.hpp:1022: error: no matching function for call to ‘Catch::ExpressionLhs<const unsigned int&>::ExpressionLhs(const unsigned int&)’
../../include/catch/catch.hpp:938: note: candidates are: Catch::ExpressionLhs<const unsigned int&>::ExpressionLhs(const Catch::ExpressionLhs<const unsigned int&>&)
../../include/catch/catch.hpp: In member function ‘Catch::ExpressionLhs<const T&> Catch::ExpressionDecomposer::operator->*(const T&) [with T = stylist::Article::article_type]’:
../../src/tests/article.cc:16:   instantiated from here
../../include/catch/catch.hpp:1022: error: no matching function for call to ‘Catch::ExpressionLhs<const stylist::Article::article_type&>::ExpressionLhs(const stylist::Article::article_type&)’
../../include/catch/catch.hpp:938: note: candidates are: Catch::ExpressionLhs<const stylist::Article::article_type&>::ExpressionLhs(const Catch::ExpressionLhs<const stylist::Article::article_type&>&)
../../include/catch/catch.hpp: In member function ‘Catch::ExpressionLhs<const T&> Catch::ExpressionDecomposer::operator->*(const T&) [with T = int]’:
../../src/tests/article.cc:17:   instantiated from here
../../include/catch/catch.hpp:1022: error: no matching function for call to ‘Catch::ExpressionLhs<const int&>::ExpressionLhs(const int&)’
../../include/catch/catch.hpp:938: note: candidates are: Catch::ExpressionLhs<const int&>::ExpressionLhs(const Catch::ExpressionLhs<const int&>&)
../../include/catch/catch.hpp: In member function ‘Catch::ExpressionLhs<const T&> Catch::ExpressionDecomposer::operator->*(const T&) [with T = float]’:
../../src/tests/article.cc:20:   instantiated from here
../../include/catch/catch.hpp:1022: error: no matching function for call to ‘Catch::ExpressionLhs<const float&>::ExpressionLhs(const float&)’
../../include/catch/catch.hpp:938: note: candidates are: Catch::ExpressionLhs<const float&>::ExpressionLhs(const Catch::ExpressionLhs<const float&>&)
../../include/catch/catch.hpp: In member function ‘Catch::ExpressionLhs<const T&> Catch::ExpressionDecomposer::operator->*(const T&) [with T = time_t]’:
../../src/tests/article.cc:24:   instantiated from here
../../include/catch/catch.hpp:1022: error: no matching function for call to ‘Catch::ExpressionLhs<const time_t&>::ExpressionLhs(const long int&)’
../../include/catch/catch.hpp:938: note: candidates are: Catch::ExpressionLhs<const time_t&>::ExpressionLhs(const Catch::ExpressionLhs<const time_t&>&)
../../include/catch/catch.hpp: In member function ‘Catch::ExpressionLhs<const T&> Catch::ExpressionDecomposer::operator->*(const T&) [with T = size_t]’:
../../src/tests/article.cc:249:   instantiated from here
../../include/catch/catch.hpp:1022: error: no matching function for call to ‘Catch::ExpressionLhs<const size_t&>::ExpressionLhs(const long unsigned int&)’
../../include/catch/catch.hpp:938: note: candidates are: Catch::ExpressionLhs<const size_t&>::ExpressionLhs(const Catch::ExpressionLhs<const size_t&>&)
...

@wichert wichert mentioned this pull request Nov 16, 2012
@philsquared
Copy link
Collaborator

Ha! I just opened issues to report the same thing!
I can't fix this properly in GitHub until a bit later - but if you just go to line 942 and remove the const and ref it should work.
Sorry about that (and thanks for opening the bug - saved me from doing it)

@wichert
Copy link
Contributor Author

wichert commented Nov 16, 2012

I can make a pull request with that change so you can click on a merge button. would that help?

philsquared added a commit that referenced this pull request Nov 16, 2012
@philsquared philsquared merged commit 88a3f23 into catchorg:master Nov 16, 2012
@philsquared
Copy link
Collaborator

Gah! I suck at GitHub. I accepted the merge and it applied it to Master.

@wichert
Copy link
Contributor Author

wichert commented Nov 16, 2012

Most likely the fault is mine here - the target branch is something you set when creating a pull request, not something you can set when merging.

philsquared added a commit that referenced this pull request Nov 16, 2012
Added a new test to try to highlight issue.
@philsquared
Copy link
Collaborator

Hopefully this fixes it on integration (I am unable to repro on my machine)

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.

None yet

2 participants