Skip to content

Conversation

shravanrn
Copy link
Contributor

The UTF8 conversion functions are broken in a slightly different way in VS2017. Add functions to hide these differences

@shravanrn
Copy link
Contributor Author

The errors in the CI build process seem to be unrelated to this change

Copy link
Member

@mike-lischke mike-lischke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks.

@@ -10,12 +10,34 @@
namespace antlrcpp {
// For all conversions utf8 <-> utf32.
// VS 2015 has a bug in std::codecvt_utf8<char32_t> (VS 2013 works fine).
#if defined(_MSC_VER) && _MSC_VER == 1900
#if defined(_MSC_VER) && _MSC_VER > 1900 && _MSC_VER < 2000

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't be #if defined(_MSC_VER) && _MSC_VER >= 1900?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, true. @shravanrn can you fix that yet?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and bellow

@shravanrn
Copy link
Contributor Author

shravanrn commented May 15, 2017

Sorry about the delay. Based on comments I realized I had actually gotten this slightly incorrect the last time. I have double checked that the following works for both VS2015 and VS 2017

@shravanrn
Copy link
Contributor Author

@mike-lischke @KindDragon - Just a friendly reminder :)

@mike-lischke
Copy link
Member

mike-lischke commented May 31, 2017

We need @parrt for a merge. Development on ANTLR4 stopped abruptly and everybody is now waiting for a new time slot where things begin to move again. However, it's not sure that "everybody" has time to move at the same moment as the ANTLR4 starts moving again...

@parrt
Copy link
Member

parrt commented May 31, 2017

Sorry...here ya go.

@parrt parrt added this to the 4.7.1 milestone May 31, 2017
@parrt parrt merged commit 2c4a55c into antlr:master May 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants