Skip to content

Conversation

@linev
Copy link
Member

@linev linev commented Apr 10, 2017

Plus minimal change in websocket id - use UInt_t instead of void*

@linev
Copy link
Member Author

linev commented Apr 10, 2017

Seems to be, my configuration for clang-format does not really match with the travis CI.

@linev
Copy link
Member Author

linev commented Apr 10, 2017

Please ignore it - it has one line of code from webgui prototype.
I need to remove it.

@linev linev requested a review from bellenot April 10, 2017 16:48
Copy link
Member

@bellenot bellenot left a comment

Choose a reason for hiding this comment

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

Should I still review it, or will you submit a corrected one?
(your comment is not clear)

@linev
Copy link
Member Author

linev commented Apr 10, 2017

I will try to fix compilation problem.
Tomorrow I will update my "http_travis" branch.
After such update it should be possible to merge request.

But another problem with clangFormat will remain.
Formatting rules here https://root.cern.ch/coding-conventions does not correspond to Travis CI checker.

@bellenot
Copy link
Member

You should just be using the .clang-format in the repository directly

@phsft-bot
Copy link

Starting build on centos7/gcc49, mac1011/native, slc6/gcc49, slc6/gcc62, ubuntu14/native and CMake flags -Dccache=ON -Dimt=OFF

@linev
Copy link
Member Author

linev commented Apr 11, 2017

From my side I am done.
At least Travis CI is now happy :)

@bellenot bellenot merged commit f03a48e into root-project:master Apr 11, 2017
@bellenot
Copy link
Member

Thanks Sergey!

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