head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.26 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.24 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.22 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.20 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.18 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.16 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.14 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.12 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.10 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.8 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.6 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.4 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.2 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.2.0.14 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.12 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.10 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.8 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.6 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.4 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.2 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.1.1.1.0.4 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.2 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2007.05.22.12.17.37; author spz; state dead; branches; next 1.2; 1.2 date 2005.08.26.08.41.46; author spz; state Exp; branches; next 1.1; 1.1 date 2005.02.28.12.37.30; author spz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2005.02.28.12.37.30; author spz; state Exp; branches; next ; desc @@ 1.3 log @new version, new patches: upstream adopted a bunch of ours, but gcc found new things to bitch about @ text @$NetBSD: patch-ak,v 1.2 2005/08/26 08:41:46 spz Exp $ --- src/Core/util/List.hh.orig 2004-07-30 12:58:10.000000000 +0200 +++ src/Core/util/List.hh @@@@ -164,7 +164,7 @@@@ public: ListIterator (const const_ListIterator& cit) : const_ListIterator(cit.list_, cit.ptr_) {} ListIterator (const List &l, ListNode *p=0) : const_ListIterator(l, p?p:l.forw) {} - operator T* () const { return (ptr_==(ListNode*)list_) ? 0 : (T*)ptr_; } + operator T* () const { return (const_ListIterator::ptr_==(ListNode*)const_ListIterator::list_) ? 0 : (T*)const_ListIterator::ptr_; } T* operator-> () const { return (T*)const_ListIterator::operator->(); } ListIterator& operator++ () { // prefix ++ const_ListIterator::operator++(); @@@@ -185,17 +185,17 @@@@ public: const_ListSearchIterator& operator++ () { // prefix ++ for (const_ListIterator::operator++(); - ptr_!=(ListNode*)list_; + const_ListIterator::ptr_!=(ListNode*)const_ListIterator::list_; const_ListIterator::operator++()) { - if (((T*)ptr_)->isKey(key_)) break; + if (((T*)const_ListIterator::ptr_)->isKey(key_)) break; } return *this; } const_ListSearchIterator& operator-- () { // prefix -- for (const_ListIterator::operator--(); - ptr_!=(ListNode*)list_; + const_ListIterator::ptr_!=(ListNode*)const_ListIterator::list_; const_ListIterator::operator--()) { - if (((T*)ptr_)->isKey(key_)) break; + if (((T*)const_ListIterator::ptr_)->isKey(key_)) break; } return *this; } @@@@ -212,7 +212,7 @@@@ public: : const_ListSearchIterator(k, l, p?p:(ListNode*)&l) {} - operator T* () const { return (ptr_==(ListNode*)list_) ? 0 : (T*)ptr_; } + operator T* () const { return (const_ListIterator::ptr_==(ListNode*)const_ListIterator::list_) ? 0 : (T*)const_ListIterator::ptr_; } T* operator-> () const { return (T*)const_ListIterator::operator->(); } ListSearchIterator& operator++ () { // prefix ++ const_ListSearchIterator::operator++(); @@@@ -407,11 +407,11 @@@@ public: * (A1 A2 A3) and (A4 B C), where A1==A2==A3==A4, * will be equal. */ - if (length != b.length) + if (List::length != b.length) return false; ListNode *e, *e2; - for (e = forw; e != (ListNode*)this; e = e->forw) { + for (e = List::forw; e != (ListNode*)this; e = e->forw) { for (e2 = b.forw; e2 != (const ListNode*) &b; e2 = e2->forw) if (*(T*)e == *(T*)e2) break; @@@@ -451,31 +451,31 @@@@ public: void insertSorted(T *t) { ListNode *e; - for (e = forw; e != (ListNode*)this && (*(T*)e < *t); e = e->forw) + for (e = List::forw; e != (ListNode*)this && (*(T*)e < *t); e = e->forw) ; if (e != (ListNode*)this) t->__link__(e->back, e); else - t->__link__(back, this); + t->__link__(List::back, this); - length++; + List::length++; } bool insertSortedNoDups(T *t) { ListNode *e; - for (e = forw; e != (ListNode*)this && (*(T*)e < *t); e = e->forw) + for (e = List::forw; e != (ListNode*)this && (*(T*)e < *t); e = e->forw) ; if (e != (ListNode*)this) { if (!(*(T*)e == *t)) { t->__link__(e->back, e); - length++; + List::length++; return true; } } else { - t->__link__(back, this); - length++; + t->__link__(List::back, this); + List::length++; return true; } return false; @@@@ -484,7 +484,7 @@@@ public: // do a sorted merge void splice(SortedList& l) { ListNode *t; - ListNode *e = forw; + ListNode *e = List::forw; while (!l.isEmpty()) { t = l.forw; t->__unlink__(); @@@@ -495,16 +495,16 @@@@ public: if (e != (ListNode*)this) t->__link__(e->back, e); else - t->__link__(back, this); + t->__link__(List::back, this); } - length += l.length; + List::length += l.length; } // do a sorted merge void splice(List& l) { ListNode *t; - ListNode *e = forw; + ListNode *e = List::forw; while (!l.isEmpty()) { t = l.forw; t->__unlink__(); @@@@ -514,7 +514,7 @@@@ public: // sorted merge no dups void spliceNoDups(SortedList& l) { ListNode *t; - ListNode *e = forw; + ListNode *e = List::forw; while (!l.isEmpty()) { t = l.forw; t->__unlink__(); @@@@ -527,16 +527,16 @@@@ public: t->__link__(e->back, e); } else - t->__link__(back, this); + t->__link__(List::back, this); } - length += l.length; + List::length += l.length; } T* find(const T &t) const { - for (ListNode *e = forw; e != (const ListNode*)this; e = e->forw) + for (ListNode *e = List::forw; e != (const ListNode*)this; e = e->forw) if (*(T*)e == t) return (T*)e; else if (!(*(T*)e < t)) @@@@ -572,37 +572,37 @@@@ public: } WRRListIterator& operator++ () { // prefix ++ - ListNode *position = ptr_; + ListNode *position = ListIterator::ptr_; for (ListIterator::operator++ (); *this; ListIterator::operator++ ()) - if ((*uniform_)() < ((T *) ptr_)->weight()) + if ((*uniform_)() < ((T *) ListIterator::ptr_)->weight()) return *this; // we do this twice to handle circular queue for (ListIterator::operator++ (); - ptr_ != position; + ListIterator::ptr_ != position; ListIterator::operator++ ()) - if ((*uniform_)() < ((T *) ptr_)->weight()) + if ((*uniform_)() < ((T *) ListIterator::ptr_)->weight()) return *this; return *this; } WRRListIterator& operator-- () { // prefix -- - ListNode *position = ptr_; + ListNode *position = ListIterator::ptr_; for (ListIterator::operator-- (); *this; ListIterator::operator-- ()) - if ((*uniform_)() < ((T *) ptr_)->weight()) + if ((*uniform_)() < ((T *) ListIterator::ptr_)->weight()) return *this; // we do this twice to handle circular queue for (ListIterator::operator-- (); - ptr_ != position; + ListIterator::ptr_ != position; ListIterator::operator-- ()) - if ((*uniform_)() < ((T *) ptr_)->weight()) + if ((*uniform_)() < ((T *) ListIterator::ptr_)->weight()) return *this; return *this; } @ 1.2 log @make configure-option --enable-debug compile make RtConfig -config junos work fix a bug regarding Cisco export filters in RtConfig @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d14 1 a14 1 @@@@ -185,9 +185,9 @@@@ public: d26 10 @ 1.1.1.1 log @IRRToolSet is a suite of policy analysis tools to operate with routing policies in RPSL [RFC 2622] format, registered in an Internet Routing Registry(IRR). The main goal of the project is to make routing information more convenient and useful for network engineers, by providing tools for automated router configuration, routing policies analysis, and maintenance. @ text @@