X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FParse.cci;h=3ac5ed4684434112fe8952f05784d14701a3655a;hb=fc1569e67cfda71bc8c406617a5e0b05f28f1b47;hp=fcbb81f3fb8c89e7b0249fb08cbd455497f49019;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Utils/Console/Parse.cci b/senf/Utils/Console/Parse.cci index fcbb81f..3ac5ed4 100644 --- a/senf/Utils/Console/Parse.cci +++ b/senf/Utils/Console/Parse.cci @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -27,7 +27,7 @@ // (disabled) #include "Parse.ih" // Custom includes -#include "../../Utils/senfassert.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// @@ -226,7 +226,7 @@ senf::console::ParseCommandInfo::ArgumentIterator::dereference() const { if (b_ == e_) setRange(); - return b_->is(Token::ArgumentGroupOpen) + return b_->is(Token::ArgumentGroupOpen) ? boost::make_iterator_range(boost::next(b_), boost::prior(e_)) : boost::make_iterator_range(b_, e_); } @@ -329,7 +329,7 @@ senf::console::CheckedArgumentIteratorWrapper::operator++(int) prefix_ senf::console::CommandParser::Impl & senf::console::CommandParser::impl() { - SENF_ASSERT(impl_); + SENF_ASSERT(impl_, "Ineral error: PIMPL pointer NULL ??"); return *impl_; }