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

sclang: remove dead code #4934

Merged
merged 3 commits into from
May 23, 2020
Merged

sclang: remove dead code #4934

merged 3 commits into from
May 23, 2020

Conversation

mossheim
Copy link
Contributor

Purpose and Motivation

remove a lot of unnecessary function declarations in primitives, perhaps due to requirements of early C++ compilers

also add blank lines to make file header comments stand out a bit

also remove dead code turned on with SC_PLUGINS macro (unused).

Types of changes

  • Bug fix

To-do list

  • Code is tested
  • All tests are passing
  • Updated documentation
  • This PR is ready for review

@mossheim mossheim added the comp: sclang sclang C++ implementation (primitives, etc.). for changes to class lib use "comp: class library" label May 16, 2020
@patrickdupuis
Copy link
Contributor

Out of curiosity, is there a reason this it aimed at 3.11?

@mossheim
Copy link
Contributor Author

Out of curiosity, is there a reason this it aimed at 3.11?

mainly because it's harmless, and also because i find it easier when 3.11 and develop diverge less.

@dyfer
Copy link
Member

dyfer commented May 22, 2020

This looks fine to me, i.e. SC still compiles and works :)

I'm wondering whether putting this into develop would make it less likely to have marge conflicts later, when we merge 3.11 into develop. Or maybe it's just safest to wait with this PR until 3.11.1 is released and we merge 3.11 into develop (and this PR goes into develop) Then we'll know we are not tempting any conflicts...

@mossheim
Copy link
Contributor Author

there will be fewer conflicts in the future if this change is in both branches. as for existing conflicts merging this into 3.11 and then into develop, you can test that yourself locally. there is one conflict in array primitives because of the levenstein distance primitive. it's easy to manage, and i'm happy to do it as soon as this is merged.

also, i'm not sure but it sounds like there is an assumption in your comment that we only merge 3.11 to develop after or during a release. that's not the case; those merges can happen at any time.

@mossheim
Copy link
Contributor Author

btw, the way i tested locally:

git checkout 3.11
git pull
git checkout develop
git pull
git checkout 3.11
git merge topic/dead-code
git checkout develop
git merge 3.11
git mergetool # examine merge conflicts

# undoing:
git merge --abort
git checkout 3.11
git reset --hard upstream/3.11

@dyfer
Copy link
Member

dyfer commented May 22, 2020

(...) it's easy to manage, and i'm happy to do it as soon as this is merged.

thanks!

also, i'm not sure but it sounds like there is an assumption in your comment that we only merge 3.11 to develop after or during a release. that's not the case; those merges can happen at any time.

Good point. I know we can merge anytime, but sometimes we don't for a while :)

@brianlheim after your last comment I agree that getting this in both branches soon would be best.

@mossheim
Copy link
Contributor Author

thanks!

@mossheim mossheim merged commit b17841a into supercollider:3.11 May 23, 2020
@mossheim mossheim deleted the topic/dead-code branch May 23, 2020 02:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
comp: sclang sclang C++ implementation (primitives, etc.). for changes to class lib use "comp: class library"
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants