X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FVectorParser.cti;h=1a4efe3068f8048685e0fa7679973a98bf8bf301;hb=refs%2Fheads%2Fmaster;hp=45faf91fe858107357c8f6a4ef96c9dcd312f7ae;hpb=af5fee58087b479a8a346dc5f94047ec0c5f79cf;p=senf.git

diff --git a/senf/Packets/VectorParser.cti b/senf/Packets/VectorParser.cti
index 45faf91..1a4efe3 100644
--- a/senf/Packets/VectorParser.cti
+++ b/senf/Packets/VectorParser.cti
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// 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 <g0dil@berlios.de>
 
 /** \file
     \brief VectorParser inline template implementation */
@@ -28,9 +33,9 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::VectorParser<ElementParser,Sizer>
 
 template <class ElementParser, class AuxPolicy>
@@ -45,7 +50,7 @@ prefix_ senf::VectorParser<ElementParser,AuxPolicy>::VectorParser(AuxPolicy poli
 {}
 
 template <class ElementParser, class AuxPolicy>
-prefix_ typename senf::VectorParser<ElementParser,AuxPolicy>::size_type
+prefix_ senf::PacketInterpreterBase::size_type
 senf::VectorParser<ElementParser,AuxPolicy>::bytes()
     const
 {
@@ -55,11 +60,11 @@ senf::VectorParser<ElementParser,AuxPolicy>::bytes()
 // Container interface
 
 template <class ElementParser, class AuxPolicy>
-prefix_ typename senf::VectorParser<ElementParser,AuxPolicy>::size_type
+prefix_ senf::PacketInterpreterBase::size_type
 senf::VectorParser<ElementParser,AuxPolicy>::size()
     const
 {
-    return aux(i(),state());
+    return AuxPolicy::aux(i(),state());
 }
 
 template <class ElementParser, class AuxPolicy>
@@ -74,7 +79,7 @@ prefix_ typename senf::VectorParser<ElementParser,AuxPolicy>::iterator
 senf::VectorParser<ElementParser,AuxPolicy>::begin()
     const
 {
-    return iterator(adjust(i(),state()),state());
+    return iterator(AuxPolicy::adjust(i(),state()),state());
 }
 
 template <class ElementParser, class AuxPolicy>
@@ -164,7 +169,7 @@ prefix_ void senf::VectorParser<ElementParser,AuxPolicy>::resize(size_type n, Va
     c.resize(n,value);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::VectorParser_wrapper<Parser,SizeParser,Container>
 
 // structors and default members
@@ -175,7 +180,7 @@ prefix_ void senf::VectorParser<ElementParser,AuxPolicy>::resize(size_type n, Va
 template <class ElementParser, class AuxPolicy>
 prefix_ senf::VectorParser_Container<ElementParser,AuxPolicy>::
 VectorParser_Container(parser_type const & vector)
-    : AuxPolicy::WrapperPolicy(static_cast<AuxPolicy const &>(vector)), state_ (vector.state()), 
+    : AuxPolicy::WrapperPolicy(static_cast<AuxPolicy const &>(vector)), state_ (vector.state()),
       i_ (std::distance(data().begin(),vector.i()))
 {}
 
@@ -186,7 +191,7 @@ prefix_ typename senf::VectorParser_Container<ElementParser,AuxPolicy>::size_typ
 senf::VectorParser_Container<ElementParser,AuxPolicy>::size()
     const
 {
-    return aux(i(),state());
+    return AuxPolicy::WrapperPolicy::aux(i(),state());
 }
 
 template <class ElementParser, class AuxPolicy>
@@ -201,7 +206,7 @@ prefix_ typename senf::VectorParser_Container<ElementParser,AuxPolicy>::iterator
 senf::VectorParser_Container<ElementParser,AuxPolicy>::begin()
     const
 {
-    return iterator(adjust(i(),state()),state());
+    return iterator( AuxPolicy::WrapperPolicy::adjust(i(),state()),state());
 }
 
 template <class ElementParser, class AuxPolicy>
@@ -342,10 +347,10 @@ senf::VectorParser_Container<ElementParser,AuxPolicy>::bytes()
 template <class ElementParser, class AuxPolicy>
 prefix_ void senf::VectorParser_Container<ElementParser,AuxPolicy>::setSize(size_type value)
 {
-    aux(value, i(),state());
+    AuxPolicy::WrapperPolicy::aux(value, i(),state());
 }
 
-/////////////////////////////cti.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_