X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FSysInfo.cc;h=c9080968ee21ffce8fddcea723abe1f741b76014;hb=HEAD;hp=093453c6ae827e2a4ac3cf9b049f9b14bc163fdb;hpb=80afad5e6501794ebf74e49ebd7220fa355b4fce;p=senf.git diff --git a/senf/Utils/Console/SysInfo.cc b/senf/Utils/Console/SysInfo.cc index 093453c..c908096 100644 --- a/senf/Utils/Console/SysInfo.cc +++ b/senf/Utils/Console/SysInfo.cc @@ -2,23 +2,28 @@ // // Copyright (C) 2010 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Thorsten Horstmann // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Thorsten Horstmann /** \file \brief SysInfo non-inline non-template implementation */ @@ -32,9 +37,9 @@ #include "ParsedCommand.hh" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -prefix_ senf::console::SysInfo::Proxy::Proxy(std::string const & descr, unsigned pos) +prefix_ senf::console::SysInfo::Proxy::Proxy(std::string const & descr, int pos) { SysInfo::instance().addEntry( descr, pos); } @@ -44,12 +49,12 @@ prefix_ senf::console::SysInfo::SysInfo() sysdir().add("info", factory::Command(&SysInfo::dump, this)); } -prefix_ void senf::console::SysInfo::addEntry(std::string const & descr, unsigned pos) +prefix_ void senf::console::SysInfo::addEntry(std::string const & descr, int pos) { if (pos < 0) descr_.push_back( descr); else - descr_.insert( boost::next(descr_.begin(), pos > descr_.size() ? descr_.size() : pos), descr); + descr_.insert( boost::next(descr_.begin(), pos > int(descr_.size()) ? int(descr_.size()) : pos), descr); } @@ -61,7 +66,7 @@ prefix_ void senf::console::SysInfo::dump(std::ostream & os) } } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_