From e6fb2ad53c8f5a86134da006c1ad8bb6087e6dd3 Mon Sep 17 00:00:00 2001 From: "T. van der Zwan" Date: Fri, 20 Dec 2013 20:55:23 +0000 Subject: [PATCH 1/2] Fixed minor bug (found by clang :-) ) with incorrect ; after if statemtn Former-commit-id: 12353a7b0cc67e0496c7f28baf063eddfcc973a9 --- libsrc/hyperion/Hyperion.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsrc/hyperion/Hyperion.cpp b/libsrc/hyperion/Hyperion.cpp index 3b726ed5..bfe14a9d 100644 --- a/libsrc/hyperion/Hyperion.cpp +++ b/libsrc/hyperion/Hyperion.cpp @@ -363,7 +363,7 @@ void Hyperion::clear(int priority) _muxer.clearInput(priority); // update leds if necessary - if (priority < _muxer.getCurrentPriority()); + if (priority < _muxer.getCurrentPriority()) { update(); } From c4e20d0d3623040c58bbfa0120ab515cc48f4223 Mon Sep 17 00:00:00 2001 From: "T. van der Zwan" Date: Thu, 19 Dec 2013 21:02:02 +0000 Subject: [PATCH 2/2] Fixed compiler warning is getoptplusplus Former-commit-id: ab8f29c2652d7905dd267ae41530e2d37c6ab488 --- dependencies/build/getoptPlusPlus/getoptpp.cc | 8 ++++---- dependencies/include/getoptPlusPlus/getoptpp.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies/build/getoptPlusPlus/getoptpp.cc b/dependencies/build/getoptPlusPlus/getoptpp.cc index 99cd3f89..4653ebb9 100644 --- a/dependencies/build/getoptPlusPlus/getoptpp.cc +++ b/dependencies/build/getoptPlusPlus/getoptpp.cc @@ -45,7 +45,7 @@ void OptionsParser::parse(int argc, const char* argv[]) throw(runtime_error) vector v(&argv[1], &argv[argc]); - ParserState state(*this, v); + ParserState state(/* *this,*/ v); for(; !state.end(); state.advance()) { @@ -164,7 +164,7 @@ Parameter& ParameterSet::operator[](char c) const { for(std::list::const_iterator i = parameters.begin(); i!= parameters.end(); i++) { if((*i)->shortOption() == c) return *(*i); } - throw out_of_range("ParameterSet["+c+string("]")); + throw out_of_range("ParameterSet["+string(&c)+string("]")); } @@ -185,8 +185,8 @@ Parameter& ParameterSet::operator[](const string& param) const { */ -ParserState::ParserState(OptionsParser &opts, vector& args) : - opts(opts), arguments(args), iterator(args.begin()) +ParserState::ParserState(/*OptionsParser &opts, */vector& args) : + /*opts(opts),*/ arguments(args), iterator(args.begin()) { } diff --git a/dependencies/include/getoptPlusPlus/getoptpp.h b/dependencies/include/getoptPlusPlus/getoptpp.h index bd98081b..cfa9102f 100644 --- a/dependencies/include/getoptPlusPlus/getoptpp.h +++ b/dependencies/include/getoptPlusPlus/getoptpp.h @@ -129,11 +129,11 @@ public: void advance(); bool end() const; protected: - ParserState(OptionsParser &opts, std::vector& args); + ParserState(/*OptionsParser &opts,*/ std::vector& args); private: friend class OptionsParser; - OptionsParser &opts; +// OptionsParser &opts; const std::vector &arguments; std::vector::const_iterator iterator; };