X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FSTLSupport.ct;h=e0f9a48421300ea36454c1c852d8807a57d711fb;hb=1342c5d49ca8bd523c9fdf7d89b40448cdfd394b;hp=108b9744ec9258b80b6e03402491a002a58eb804;hpb=a30f975608bae2dcee151af15dc7f40602627615;p=senf.git diff --git a/senf/Utils/Console/STLSupport.ct b/senf/Utils/Console/STLSupport.ct index 108b974..e0f9a48 100644 --- a/senf/Utils/Console/STLSupport.ct +++ b/senf/Utils/Console/STLSupport.ct @@ -1,24 +1,29 @@ // $Id$ // -// Copyright (C) 2009 +// Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund // -// 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): +// Stefan Bund /** \file \brief VectorSupport non-inline template implementation */ @@ -29,18 +34,18 @@ #include #define prefix_ -///////////////////////////////ct.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #ifndef DOXYGEN -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::detail::CollectionArgumentTraitsBase template prefix_ std::string senf::console::detail::CollectionArgumentTraitsBase::description() { - return senf::prettyBaseName(typeid(Collection)) + "<" + return senf::prettyBaseName(typeid(Collection)) + "<" + ArgumentTraits::description() + ">"; } @@ -53,7 +58,7 @@ senf::console::detail::CollectionArgumentTraitsBase::str(Collection return ss.str(); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::detail::CollectionArgumentTraits template @@ -69,7 +74,7 @@ parse(ParseCommandInfo::TokensRange const & tokens, Collection & out) } } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::detail::CollectionReturnValueTraits template @@ -83,7 +88,7 @@ senf::console::detail::CollectionReturnValueTraits::format(Collectio if (i != i_end) for (;;) { os << senf::console::str(*i); - if (++i == i_end) + if (++i == i_end) break; else os << " "; @@ -91,7 +96,7 @@ senf::console::detail::CollectionReturnValueTraits::format(Collectio os << ")"; } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::detail::MapArgumentTraits template @@ -115,7 +120,7 @@ parse(ParseCommandInfo::TokensRange const & tokens, Collection & out) template prefix_ std::string senf::console::detail::MapArgumentTraits::description() { - return senf::prettyBaseName(typeid(Collection)) + "<" + return senf::prettyBaseName(typeid(Collection)) + "<" + ArgumentTraits::description() + "," + ArgumentTraits::description() + ">"; } @@ -129,7 +134,7 @@ senf::console::detail::MapArgumentTraits::str(Collection const & val return ss.str(); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::detail::MapReturnValueTraits template @@ -145,7 +150,7 @@ senf::console::detail::MapReturnValueTraits::format(Collection const os << senf::console::str(i->first) << "=" << senf::console::str(i->second); - if (++i == i_end) + if (++i == i_end) break; else os << " "; @@ -153,7 +158,7 @@ senf::console::detail::MapReturnValueTraits::format(Collection const os << ")"; } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::ArgumentTraits< std::pair > template @@ -181,7 +186,7 @@ prefix_ std::string senf::console::ArgumentTraits< std::pair >::str(type return ss.str(); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::ReturnValueTraits< std::pair > template @@ -194,7 +199,7 @@ prefix_ void senf::console::ReturnValueTraits< std::pair >::format(type c #endif -///////////////////////////////ct.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_