summaryrefslogtreecommitdiff
path: root/net-mgmt/irrtoolset/files/patch-ac
blob: ca2b0e1d8f1fb50c2b4d296a92997790f5565892 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
--- src/dbase/Node.h.orig	Sat Nov 27 18:11:57 1999
+++ src/dbase/Node.h	Sat Nov 27 18:16:21 1999
@@ -101,7 +101,7 @@
   protected:
    virtual void print(ostream &os) = 0;
   public:
-   virtual operator== (Node &b) = 0;
+   virtual int operator== (Node &b) = 0;
    virtual void InOrderPrint() = 0;
    virtual void PostOrderPrint() { InOrderPrint(); }
    virtual ~Node() {};
@@ -144,7 +144,7 @@
    virtual void print(ostream &os) = 0;
 
   public:
-   virtual Execute(Route &r) = 0;
+   virtual void Execute(Route &r) = 0;
    virtual ActionNode *FindFirst(Node_t _type) = 0;
    int operator< (ActionNode &b);
    friend ostream &operator<<(ostream &os, ActionNode *an) {
@@ -172,7 +172,7 @@
       type = T_ANDNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_ANDNode 
 	 && left  == ((ANDNode&) b).left
 	 && right == ((ANDNode&) b).right;
@@ -200,7 +200,7 @@
       type = T_ORNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_ORNode 
 	 && left  == ((ORNode&) b).left
 	 && right == ((ORNode&) b).right;
@@ -227,7 +227,7 @@
       type = T_NotNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_NotNode 
 	 && left  == ((NotNode&) b).left;
    }
@@ -256,7 +256,7 @@
       type = T_AssignNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_AssignNode 
 	 && val == ((AssignNode&) b).val
 	 && left  == ((AssignNode&) b).left;
@@ -281,7 +281,7 @@
       type = T_ANYNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_ANYNode;
    }
 
@@ -305,7 +305,7 @@
       type = T_ASNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_ASNode 
 	 && val == ((ASNode&) b).val;
    }
@@ -330,7 +330,7 @@
       type = T_ASMacroNode;
   }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_ASMacroNode 
 	 && val == ((ASMacroNode&) b).val;
    }
@@ -355,7 +355,7 @@
       type = T_CommNode;
    }
 
-    virtual operator== (Node& b) {
+    virtual int operator== (Node& b) {
       return b.type == T_CommNode 
 	 && val == ((CommNode&) b).val;
    }
@@ -382,7 +382,7 @@
       cidr_root = NULL;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_NetListNode 
 	 && nets == ((NetListNode&) b).nets;
    }
@@ -391,7 +391,7 @@
    virtual NormalExpression *Evaluate(int expand);
    virtual int match(Route &r, char dontcare);
    virtual int match_exact_or_more_specific(Route &r, char dontcare);
-   add(Pix pi) { nets.add(pi); }
+   void add(Pix pi) { nets.add(pi); }
 };
 
 ////////////////////////////// ASPathNode //////////////////////////////
@@ -412,7 +412,7 @@
       type = T_ASPathNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       ASSERT(0);
       return 0;
    }
@@ -438,7 +438,7 @@
       type = T_RegisterNode;
    }
 
-    virtual operator== (Node& b) {
+    virtual int operator== (Node& b) {
       return b.type == T_RegisterNode 
 	 && val == ((RegisterNode&) b).val;
    }
@@ -460,13 +460,13 @@
       type = T_PrefNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_PrefNode 
 	 && val == ((PrefNode&) b).val;
    }
 
    virtual void InOrderPrint();
-   virtual Execute(Route &r) {
+   virtual void Execute(Route &r) {
    }
    virtual ActionNode *FindFirst(Node_t _type) {
       if (type == _type)
@@ -492,13 +492,13 @@
       type = T_MEDNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_MEDNode 
 	 && val == ((MEDNode&) b).val;
    }
 
    virtual void InOrderPrint();
-   virtual Execute(Route &r) {
+   virtual void Execute(Route &r) {
    }
    virtual ActionNode *FindFirst(Node_t _type) {
       if (type == _type)
@@ -524,13 +524,13 @@
       type = T_DPANode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_DPANode 
 	 && val == ((DPANode&) b).val;
    }
 
    virtual void InOrderPrint();
-   virtual Execute(Route &r) {
+   virtual void Execute(Route &r) {
    }
    virtual ActionNode *FindFirst(Node_t _type) {
       if (type == _type)
@@ -552,12 +552,12 @@
       type = T_NoopNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_NoopNode;
    }
 
    virtual void InOrderPrint();
-   virtual Execute(Route &r) {}
+   virtual void Execute(Route &r) {}
    virtual ActionNode *FindFirst(Node_t _type) {
       if (type == _type)
 	 return this;
@@ -581,14 +581,14 @@
    }
    virtual ~ComposeNode();
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_ComposeNode
 	 && left  == ((ComposeNode&) b).left
 	 && right == ((ComposeNode&) b).right;
    }
 
    virtual void InOrderPrint();
-   virtual Execute(Route &r) {}
+   virtual void Execute(Route &r) {}
    virtual ActionNode *FindFirst(Node_t _type) {
       ActionNode *r;
       if (type == _type)