search

iwbnwif / wxFreeChart

This is a clone (not fork) of the pbfordev/wxFreeChart repository. It has their original fixes to the the wxCode version.
Other
37 stars 21 forks source link

Fix under macOS #45

Closed mill-j closed 5 years ago

mill-j commented 6 years ago

This is just a tiny change that is need to build under macOS, I'm also just seeing how github works :)

iwbnwif commented 6 years ago

Hi, thank you for the pull request.

I am afraid I know almost nothing about OSX.

Would you mind to write a description for this patch?

In particular, why isn't the std:: namespace needed and/or what is the reason that it doesn't work on OSX?

Thank you!

mill-j commented 6 years ago

Actually this is addressed here, https://github.com/iwbnwif/wxFreeChart/issues/34 But the fix is manually editing the file before building. Perhaps I'm overlooking somthing else?

iwbnwif commented 6 years ago

There doesn't need to be std:: for any of the ports, it was a makefile problem.

Okay, this really confused me because I was sure I had reverted that change!

It seems that it was only reverted in the development branches and not the master.

Unfortunately, I haven't been able to work how to copy a reversion from one branch to another or revert a change to a specific branch on Github.

I don't have a development environment available at the moment, but will try to sort this out soon.

I will leave the PR open for now.

CodyWilson commented 6 years ago

Unfortunately, I haven't been able to work how to copy a reversion from one branch to another or revert a change to a specific branch on Github.

Reversions are commits themselves. In order to copy a reversion from one branch to another, you would have to do a pull request from the branch with the reversion, to the branch without it. But that would also pull in all of your changes in that branch, which I assume you wouldn't want since that's a lot of changes you have in that dev branch atm.

So what you could do is create another branch based on master, call it "hotfix" or whatever, and checkout that branch, then revert whatever commit or make whatever change you want. And then merge hotfix into master, as well as merge hotfix into your development branch & deal with the merge conflicts that will doubtlessly happen when they happen.

I don't recommend modifying master directly as is being done with this pull request, because the role of master is to be the "release" version. Compiling changes in a "hotfix" branch and then when you're satisfied pulling that into master makes it easier to keep master in a releasable state.