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

Fix indentation in c extension #488

Merged
merged 1 commit into from
Feb 17, 2016

Conversation

yeganer
Copy link
Contributor

@yeganer yeganer commented Feb 12, 2016

Applied the GNU C coding convention to most files in the c extension.

The following settings were used with vim:

setlocal cindent
setlocal cinoptions=>4,n-2,{2,^-2,:2,=2,g0,h2,p5,t0,+2,(0,u0,w1,m1
setlocal sw=2
setlocal sts=2
setlocal tw=79
setlocal fo-=ro fo +=cql

@yeganer
Copy link
Contributor Author

yeganer commented Feb 12, 2016

@orbitfold I hope the settings i used implement the right indentation sheme. If there is anything wrong, i'll fix it.

@unoebauer
Copy link
Contributor

@yeganer Thanks for separating these style changes from PR #485.

@yeganer
Copy link
Contributor Author

yeganer commented Feb 12, 2016

So coverage decreased by 0.0%? Nice catch coveralls!

@wkerzendorf
Copy link
Member

@orbitfold - is this in line with our c-conventions? @yeganer - this needs a rebase.

@orbitfold
Copy link
Contributor

I'll look in to it shortly.

{
imin = imid;
}
imid = (imin + imax)>>1;
Copy link
Contributor

Choose a reason for hiding this comment

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

There should be spaces after and before the bitshift operator.

@wkerzendorf
Copy link
Member

@yeganer - rebase.

Applied the GNU C coding convention to most files in the c extension.

The following settings were used with vim:

setlocal cindent
setlocal cinoptions=>4,n-2,{2,^-2,:2,=2,g0,h2,p5,t0,+2,(0,u0,w1,m1
setlocal sw=2
setlocal sts=2
setlocal tw=79
setlocal fo-=ro fo +=cql
@yeganer yeganer force-pushed the montecarlo_fix_indentation branch from 7bdc93f to 87ef34a Compare February 17, 2016 10:07
@yeganer
Copy link
Contributor Author

yeganer commented Feb 17, 2016

@wkerzendorf : done. Including fix for bitshift.

@wkerzendorf
Copy link
Member

@orbitfold @unoebauer any other comments - otherwise I'll merge after lunch.

@unoebauer
Copy link
Contributor

Fine with me

wkerzendorf added a commit that referenced this pull request Feb 17, 2016
@wkerzendorf wkerzendorf merged commit 767b251 into tardis-sn:master Feb 17, 2016
@yeganer yeganer deleted the montecarlo_fix_indentation branch March 30, 2016 13:18
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.

4 participants