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

Issue 5046 - Wrong type of implicit 'this' in struct/class templates #94

Closed
wants to merge 2 commits into from

Conversation

9rnsr
Copy link
Contributor

@9rnsr 9rnsr commented Jun 8, 2011

http://d.puremagic.com/issues/show_bug.cgi?id=5046
Template argument matching with manifest constant VarDeclaration and string expression was failed, but now it's ok.

@WalterBright
Copy link
Member

Merged second commit manually:

d3c324c

@jmacdonagh
Copy link

@WalterBright: You should use git's merge resolution rather than creating new commits.

git pull https://github.com/9rnsr/dmd.git fix5046 will fetch these two commits and attempt to merge them into your current branch. If there are conflicts (which there were), then you can use any number of merge tools to resolve it. More information is available here: http://progit.org/book/ch3-2.html

@WalterBright
Copy link
Member

Thanks. I'll give that a try next time.

On 7/18/2011 9:41 PM, jmacdonagh wrote:

@WalterBright: You should use git's merge resolution rather than creating new commits.

git pull https://github.com/9rnsr/dmd.git fix5046 will fetch these two commits and attempt to merge them into your current branch. If there are conflicts (which there were), then you can use any number of merge tools to resolve it. More information is available here: http://progit.org/book/ch3-2.html

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.

3 participants