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

Parse and store specials with unique ptr #1775

Merged

Conversation

dbenage-cx
Copy link
Member

@dbenage-cx dbenage-cx commented Oct 1, 2017

On local system, compiling with boost v1.62 or lower fails(1.63+ is ok), opening PR for CI results to help troubleshoot

Resolves #1546

@dbenage-cx dbenage-cx added category:refactoring The Issue/PR describes or contains an improved implementation. component:internal The Issue/PR deals with any project component that has no explicit `component` label. status:work in progress The PR contains some implementation but isn't ready for merging onto the main development branch. labels Oct 1, 2017
@dbenage-cx dbenage-cx added this to the v0.4.8 milestone Oct 1, 2017
@LGM-Doyle
Copy link
Contributor

@dbenage-cx I can confirm that this works on Fedora with Boost v1.63.

@dbenage-cx dbenage-cx force-pushed the fix_1546-unique_ptr-specals_parser branch from f20295a to a70904e Compare October 5, 2017 08:01
@dbenage-cx
Copy link
Member Author

1.63 introduces variadic templates, the same results can be seen by defining BOOST_NO_CXX11_VARIADIC_TEMPLATES.

I was not able to determine the correct macros and order to increase number of args.
Instead, using a struct to handle transition.

}
#endif

namespace {
const boost::phoenix::function<parse::detail::is_unique> is_unique_;

const boost::phoenix::function<parse::detail::insert> insert_;
struct special_pod {
special_pod (std::string name_,
Copy link
Member

Choose a reason for hiding this comment

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

remove space after pod

@geoffthemedio
Copy link
Member

otherwise looks fine

@dbenage-cx dbenage-cx force-pushed the fix_1546-unique_ptr-specals_parser branch from a70904e to 6e9e4ee Compare October 5, 2017 14:13
@dbenage-cx dbenage-cx removed the status:work in progress The PR contains some implementation but isn't ready for merging onto the main development branch. label Oct 5, 2017
@dbenage-cx dbenage-cx merged commit ced73db into freeorion:master Oct 5, 2017
@dbenage-cx dbenage-cx added the status:merged All relevant commits of this PR were merged into the master development branch. label Oct 5, 2017
@dbenage-cx dbenage-cx deleted the fix_1546-unique_ptr-specals_parser branch October 5, 2017 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:refactoring The Issue/PR describes or contains an improved implementation. component:internal The Issue/PR deals with any project component that has no explicit `component` label. status:merged All relevant commits of this PR were merged into the master development branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants