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

Corrects tst_palette.cpp after merge of PR6019. #6023

Merged
merged 1 commit into from
May 3, 2020

Conversation

njvdberg
Copy link
Contributor

@njvdberg njvdberg commented May 3, 2020

PR #6019 removed using namespace std; but PR #5760 introduced tst_palette.cpp which was created before the merge of PR #6019 and used vector>/code> without the std:: prefix.

Resolves: no issue

  • I signed CLA
  • I made sure the code in the PR follows the coding rules
  • I made sure the code compiles on my machine
  • I made sure there are no unnecessary changes in the code
  • I made sure the title of the PR reflects the core meaning of the issue you are solving
  • I made sure the commit message(s) contain a description and answer the question "Why do those changes fix that particular issue?" or "Why are those changes really necessary as improvements?"
  • [n.a.] I made sure the commit message title starts with "fix #424242:" if there is a related issue
  • [n.a.] I created the test (mtest, vtest, script test) to verify the changes I made

Copy link
Contributor

@Spire42 Spire42 left a comment

Choose a reason for hiding this comment

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

Ack. Thanks for the fix.

@njvdberg
Copy link
Contributor Author

njvdberg commented May 3, 2020

@Spire42 Nothing you could do about it, the 2 PR's just crossed.
And I had to correct it because my local test failed :-)

…introduced tst_palette.cpp which

was created before the merge of PR musescore#6019 and used "vector" without the "std" prefix.
@njvdberg njvdberg force-pushed the corrected-tst_palette branch from 0513a5e to 53dbea0 Compare May 3, 2020 09:56
@anatoly-os anatoly-os merged commit 128cf24 into musescore:master May 3, 2020
anatoly-os added a commit that referenced this pull request May 3, 2020
Corrects tst_palette.cpp after merge of PR6019.
anatoly-os added a commit that referenced this pull request May 3, 2020
Corrects tst_palette.cpp after merge of PR6019.
@njvdberg njvdberg mentioned this pull request May 3, 2020
12 tasks
@njvdberg njvdberg deleted the corrected-tst_palette branch May 22, 2020 08:23
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.

3 participants