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.

Sign up for GitHub

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

Switch Travis to clang 5 #1105

Merged
merged 7 commits into from
Mar 8, 2017
Merged

Switch Travis to clang 5 #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5ae727
Merge pull request #12 from OpenLightingProject/0.10
peternewman Aug 18, 2016
48d2a88
Switch to clang 4
peternewman Aug 18, 2016
bf28125
Merge branch '0.10' into 0.10-clang-latest
peternewman Feb 22, 2017
7b8c188
Switch to Clang 5.0 now it's been whitelisted in https://github.com/t…
peternewman Mar 7, 2017
04422e5
Merge branch '0.10' into 0.10-clang-latest
peternewman Mar 7, 2017
451c4e3
Die if sending DMX failed
peternewman Mar 7, 2017
d8426e1
Fix clang-5.0 errors
peternewman Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ addons:
- g++-5
packages: &core_build_clang_latest
- *core_build
- clang-3.9
- clang-5.0

matrix:
fast_finish: true
Expand All @@ -55,7 +55,7 @@ matrix:
- *core_build_clang_latest
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.9
- llvm-toolchain-precise
- os: linux
compiler: gcc
env: TASK='compile'
Expand Down Expand Up @@ -172,7 +172,7 @@ before_install:
- if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "coverage" -o "$TASK" = "doxygen" \) -a "$CXX" = "g++" ]; then export CXX="ccache g++-5" CC="ccache gcc-5"; fi
- if [ "$TASK" = "coverity" -a "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
#Use the latest clang if we're compiling with clang
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" ]; then export CXX="clang++-5.0" CC="clang-5.0"; fi
#Report the compiler version
- $CXX --version

Expand Down
2 changes: 1 addition & 1 deletion examples/ola-throughput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) {
usleep(FLAGS_sleep);
if (!ola_client.SendDmx(FLAGS_universe, buffer)) {
cout << "Send DMX failed" << endl;
return false;
exit(1);
}
}
return 0;
Expand Down
12 changes: 7 additions & 5 deletions tools/e133/e133-receiver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) {
vector<E133Endpoint*> endpoints;
auto_ptr<ola::rdm::DummyResponder> dummy_responder;
auto_ptr<ola::rdm::DiscoverableRDMControllerAdaptor>
discoverable_dummy_responder;
discoverable_dummy_responder;
auto_ptr<DmxTriWidget> tri_widget;

ola::rdm::UIDAllocator uid_allocator(*uid);
Expand Down Expand Up @@ -173,7 +173,7 @@ int main(int argc, char *argv[]) {
dummy_responder.reset(new ola::rdm::DummyResponder(*dummy_uid));
discoverable_dummy_responder.reset(
new ola::rdm::DiscoverableRDMControllerAdaptor(
*dummy_uid, dummy_responder.get()));
*dummy_uid, dummy_responder.get()));
endpoints.push_back(new E133Endpoint(discoverable_dummy_responder.get(),
E133Endpoint::EndpointProperties()));
}
Expand Down Expand Up @@ -251,12 +251,14 @@ int main(int argc, char *argv[]) {
}
simple_node = &node;

if (!node.Init())
if (!node.Init()) {
exit(ola::EXIT_UNAVAILABLE);
}

// signal handler
if (!ola::InstallSignal(SIGINT, &InteruptSignal))
return false;
if (!ola::InstallSignal(SIGINT, &InteruptSignal)) {
exit(ola::EXIT_OSERR);
}

node.Run();
if (e131_node.get()) {
Expand Down