X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FSysInfo.hh;h=354aa829b5d66d8248eba81653176479352a45e7;hb=refs%2Fheads%2Fmaster;hp=75dc01ed6d9ba77abafc7077f89b8159331d032c;hpb=7661548b20e6c7627f54bff87e0758396fd523ef;p=senf.git diff --git a/senf/Utils/Console/SysInfo.hh b/senf/Utils/Console/SysInfo.hh index 75dc01e..354aa82 100644 --- a/senf/Utils/Console/SysInfo.hh +++ b/senf/Utils/Console/SysInfo.hh @@ -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 public header */ @@ -38,20 +43,20 @@ namespace console { : public singleton { public: + friend class singleton; using singleton::instance; - void addEntry(std::string const & descr, unsigned pos=-1); + + void addEntry(std::string const & descr, int pos=-1); + void dump(std::ostream & os) const; struct Proxy { - Proxy(std::string const & descr, unsigned pos=-1); + Proxy(std::string const & descr, int pos=-1); }; private: std::list descr_; SysInfo(); - void dump(std::ostream & os) const; - - friend class singleton; }; }}