Skip to content

Conversation

@omazapa
Copy link
Contributor

@omazapa omazapa commented Mar 20, 2017

Hi Guys,

  • Added support to check if R interface is running in the thread of event loop, to avoid segfault in scientific linux running tests.
  • Fixed some datatypes according to coding conventions.

Cheers,
Omar.

@omazapa
Copy link
Contributor Author

omazapa commented Mar 20, 2017

@phsft-bot build!

but something is wrong with travis ci, can I merge it anyway?

@vgvassilev
Copy link
Member

@omazapa, it seems you are not following ROOT's coding conventions and this is why travis is unhappy. I'd strongly recommend fixing it first.

@eguiraud
Copy link
Contributor

@omazapa the quickest fix is copy-pasting the diff from the output of the travis bot to a new file in your local root repo, and running a git apply on it. You can also run clang-format yourself. I think you will need at least v3.8, and the bot suggests the following commands:

git checkout master
git-clang-format --commit 1230f79df89e95687659859cad39c9fd2e48f4eb --diff --binary clang-format

@vgvassilev
Copy link
Member

git-clang-format --commit 1230f79df89e95687659859cad39c9fd2e48f4eb --binary clang-format even applies it automatically.

@vgvassilev
Copy link
Member

Perhaps you will need to rebase this PR because we changed a little the clang-format policy today.

@omazapa
Copy link
Contributor Author

omazapa commented Mar 20, 2017

Thanks @vgvassilev and @bluehood
Sure, I will to update the code.

My bests!

@omazapa omazapa merged commit 960e7ff into root-project:master Mar 21, 2017
gganis pushed a commit to gganis/root that referenced this pull request Apr 3, 2017
* ROOTR: check if R interface is running in the thread of event loop, to
avoid segfault in scientific linux.

* ROOTR: checked with git-clang-format
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