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

replace CMath::swap with std::swap #4187

Merged
merged 3 commits into from Apr 5, 2018
Merged

replace CMath::swap with std::swap #4187

merged 3 commits into from Apr 5, 2018

Conversation

Yashs744
Copy link
Contributor

dropped CMath class function and added std function (#4186)

dropped CMath class function and added std function (#4186)
@karlnapf
Copy link
Member

Thanks!
The build is failing due to style errors (you can click it to see the log)

https://travis-ci.org/shogun-toolbox/shogun/jobs/345852507#L729
Shows you how to fix it

drop CMath class (#4187)
@karlnapf
Copy link
Member

LGTM
@vigsterkr ?

drop CMath class #4187
@shubham808 shubham808 mentioned this pull request Feb 28, 2018
@karlnapf
Copy link
Member

https://travis-ci.org/shogun-toolbox/shogun/jobs/346871904#L712
To fix the errors automatically please run:
git clang-format-3.8 --commit 36406d48ed0183b83c92c79285040322d00f69e6 --binary /usr/bin/clang-format-3.8

@karlnapf
Copy link
Member

This is good, just needs the correct style fix and we can merge it :)

@Yashs744
Copy link
Contributor Author

Okay Sir, Thank you

@Yashs744
Copy link
Contributor Author

Yashs744 commented Mar 1, 2018

Sir, I'm getting this error. I checked there is no conflict
screenshot 36

@karlnapf
Copy link
Member

karlnapf commented Mar 1, 2018

You will need to read the git manual, or use google. Keywords "rebase" "merge conflict"

@vigsterkr vigsterkr changed the title drop CMath class replace CMath::swap with std::swap Apr 5, 2018
@vigsterkr vigsterkr merged commit c8c66e6 into shogun-toolbox:develop Apr 5, 2018
ktiefe pushed a commit to ktiefe/shogun that referenced this pull request Jul 30, 2019
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.

None yet

3 participants