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

Ensure HAVE_CXX11 is checked when defining TINS_IS_CXX11 #65

Merged
merged 1 commit into from
Apr 6, 2015

Conversation

blazeable
Copy link

This is how I fixed #64, enabling compilation on VS2013 when configuring with LIBTINS_ENABLE_CXX11=0 defined. Still seems like a good idea to check this macro here, even with 3478c7b.

@mfontanini
Copy link
Owner

Can you include config.h in macros.h? Otherwise you need to have included config.h for this macro to work correctly.

@blazeable
Copy link
Author

Yes, you're right! Didn't realize that before. Also, using 'defined(x)' isn't supposed to work elsewhere than in an 'if' preprocessor directive, so I updated the previous change (also prevents C4668 in VS2013).

@blazeable
Copy link
Author

Another commit to make sure TINS_IS_CX11 can't be redefined.

@mfontanini
Copy link
Owner

Sorry, I thought the CXX11 definitions were in macros.h. So the config.h include line should be in cxxstd.h rather than in macros.h.

@blazeable
Copy link
Author

Done.

@mfontanini
Copy link
Owner

Seems good, thanks!

mfontanini added a commit that referenced this pull request Apr 6, 2015
Ensure HAVE_CXX11 is checked when defining TINS_IS_CXX11
@mfontanini mfontanini merged commit fc950f6 into mfontanini:master Apr 6, 2015
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.

Compilation fails on VS2013
2 participants