3 --- pform_disciplines
.cc
.orig
2011-11-26 03:29:20.000000000 +0000
4 +++ pform_disciplines
.cc
5 @@
-27,8 +27,8 @@ map
<perm_string
,ivl_nature_t
> natures
;
6 map
<perm_string
,ivl_discipline_t
> disciplines
;
7 map
<perm_string
,ivl_nature_t
> access_function_nature
;
9 -static perm_string nature_name
= perm_string::perm_string();
10 -static perm_string nature_access
= perm_string::perm_string();
11 +static perm_string nature_name
= perm_string();
12 +static perm_string nature_access
= perm_string();
14 void pform_start_nature(const char*name
)
16 @@
-82,8 +82,8 @@
void pform_end_nature(const struct vllty
17 // expressions that use the access function can find it.
18 access_function_nature
[nature_access
] = tmp
;
20 - nature_name
= perm_string::perm_string();
21 - nature_access
= perm_string::perm_string();
22 + nature_name
= perm_string();
23 + nature_access
= perm_string();
27 @@
-171,7 +171,7 @@
void pform_end_discipline(const struct v
30 /* Clear the static variables for the next item. */
31 - discipline_name
= perm_string::perm_string();
32 + discipline_name
= perm_string();
33 discipline_domain
= IVL_DIS_NONE
;
34 discipline_potential
= 0;