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 build when using new boost with Ogre. #452

Merged
3 commits merged into from
Jan 23, 2015
Merged

Conversation

ananace
Copy link
Member

@ananace ananace commented Jan 23, 2015

This fixes a [Parse error at "BOOST_JOIN"] if you're using - for instance - Boost 1.57.0

This fixes a [Parse error at "BOOST_JOIN"] if you're using - for instance - Boost 1.57.0
@ghost
Copy link

ghost commented Jan 23, 2015

What if we forward declare the types instead and include in the .cpp only? That would fix the parse error too, right?

@ananace
Copy link
Member Author

ananace commented Jan 23, 2015

Indeed it should, moc only runs on the .hpp's as far as I know.

@ghost
Copy link

ghost commented Jan 23, 2015

Ok, then I would prefer that solution to keep the number of #ifs to a minimum.

@ananace
Copy link
Member Author

ananace commented Jan 23, 2015

Something like this then?

ghost pushed a commit that referenced this pull request Jan 23, 2015
Fix build when using new boost with Ogre.
@ghost ghost merged commit 4db6c22 into OpenMW:master Jan 23, 2015
@ananace ananace deleted the patch-1 branch February 3, 2015 21:42
ghost pushed a commit that referenced this pull request Sep 28, 2017
water shader improvements plus rain ripple effect (#452)
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant