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

Fix lib/Basic Windows/Cygwin build #6812

Closed
wants to merge 1 commit into from
Closed

Fix lib/Basic Windows/Cygwin build #6812

wants to merge 1 commit into from

Conversation

hughbe
Copy link
Collaborator

@hughbe hughbe commented Jan 14, 2017

The problem here is that TaskQueue::addTask has an optional parameter SeparateErrors that isn't included in lib/Basic/Default/TaskQueue.inc. As such, we get overloaded member function not found in 'swift::sys::TaskQueue' errors compiling the Swift project on Windows/Cygwin

We never noticed this due to the following code

#if LLVM_ON_UNIX && !defined(__CYGWIN__)
#include "Unix/TaskQueue.inc"
#else
#include "Default/TaskQueue.inc"
#endif

@hughbe hughbe changed the title Fix MSVC errors compiling lib/Basic Fix lib/Basic Windows/Cygwin build Jan 14, 2017
@CodaFi
Copy link
Member

CodaFi commented Jan 14, 2017

/CC @matthewcarroll who is working in this area. I wonder if this fix can be folded into that patch.

@matthewcarroll
Copy link
Contributor

matthewcarroll commented Jan 14, 2017

@CodaFi,

Yes, would you like me to merge this branch into mine?

@CodaFi
Copy link
Member

CodaFi commented Jan 14, 2017

If you wouldn't mind, thanks!

@matthewcarroll
Copy link
Contributor

@CodaFi done

@hughbe
Copy link
Collaborator Author

hughbe commented Jan 14, 2017

Should I close this then

@hughbe hughbe closed this Jan 14, 2017
@hughbe hughbe deleted the taskqueue-fixes branch January 14, 2017 21:02
matthewcarroll pushed a commit to matthewcarroll/swift that referenced this pull request Jan 15, 2017
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

3 participants