blob: 449665cb698ac9206b34a493c993c664336ed46a (
plain)
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
|
$NetBSD: patch-src_Resources.hh,v 1.1 2011/12/21 13:02:10 wiz Exp $
Avoid conflict with list<>.
--- src/Resources.hh.orig 2002-11-06 11:55:10.000000000 +0000
+++ src/Resources.hh
@@ -40,24 +40,24 @@ typedef struct _ButtonStyle ButtonStyle;
#define IS_ENV_CHAR(ch) (isalnum(ch) || ch == '_')
-#define ACTLISTCLEAR(list) \
- while (! list.empty()) { \
- if (list.back()->exec) \
- delete [] list.back()->exec; \
- if (list.back()->param) \
- delete [] list.back()->param; \
- delete list.back(); \
- list.pop_back(); \
+#define ACTLISTCLEAR(rlist) \
+ while (! rlist.empty()) { \
+ if (rlist.back()->exec) \
+ delete [] rlist.back()->exec; \
+ if (rlist.back()->param) \
+ delete [] rlist.back()->param; \
+ delete rlist.back(); \
+ rlist.pop_back(); \
}
-#define ACTLISTPTRCLEAR(list) \
- while (! list->empty()) { \
- if (list->back()->exec) \
- delete [] list->back()->exec; \
- if (list->back()->param) \
- delete [] list->back()->param; \
- delete list->back(); \
- list->pop_back(); \
+#define ACTLISTPTRCLEAR(rlist) \
+ while (! rlist->empty()) { \
+ if (rlist->back()->exec) \
+ delete [] rlist->back()->exec; \
+ if (rlist->back()->param) \
+ delete [] rlist->back()->param; \
+ delete rlist->back(); \
+ rlist->pop_back(); \
}
@@ -193,13 +193,13 @@ public:
delete name;
delete cl;
delete title;
- ACTLISTCLEAR(list);
+ ACTLISTCLEAR(rlist);
}
Regex *name;
Regex *cl;
Regex *title;
- list<WaAction *> list;
+ list<WaAction *> rlist;
};
class StrComp {
|
