frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/tvdzwan/hyperion 

Former-commit-id: cd8dcbef62cb2280d5abd9bbe6624bfb2479a61d
This commit is contained in:
johan 2013-12-21 14:32:41 +01:00
parent 78795b9fa8 8033615119
commit f598f6e417
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dependencies/build/getoptPlusPlus/getoptpp.cc vendored
View File

@ -45,7 +45,7 @@ void OptionsParser::parse(int argc, const char* argv[]) throw(runtime_error)
vector<string> 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<Parameter*>::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<string>& args) :
opts(opts), arguments(args), iterator(args.begin())
ParserState::ParserState(/*OptionsParser &opts, */vector<string>& args) :
/*opts(opts),*/ arguments(args), iterator(args.begin())
{
}

4
dependencies/include/getoptPlusPlus/getoptpp.h vendored
View File

@ -129,11 +129,11 @@ public:
void advance();
bool end() const;
protected:
ParserState(OptionsParser &opts, std::vector<std::string>& args);
ParserState(/*OptionsParser &opts,*/ std::vector<std::string>& args);
private:
friend class OptionsParser;
OptionsParser &opts;
// OptionsParser &opts;
const std::vector<std::string> &arguments;
std::vector<std::string>::const_iterator iterator;
};

2
deploy/hyperion.tar.gz.REMOVED.git-id
View File

@ -1 +1 @@
42debced0ba50d4c1801b25ae3ce1a546ec7a94e
c0e8e51a825f30e490de8971fef3a31bff1df67a

2
libsrc/hyperion/Hyperion.cpp
View File

@ -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();
}