View difference between Paste ID: u0nEHWnA and
SHOW:
|
|
- or go back to the newest paste.
| 1 | - | |
| 1 | + | --- pform_disciplines.cc 2009-12-30 13:45:06.000000000 -0300 |
| 2 | +++ pform_disciplines.cc 2010-06-19 14:58:56.000000000 -0300 | |
| 3 | @@ -27,8 +27,8 @@ | |
| 4 | map<perm_string,ivl_discipline_t> disciplines; | |
| 5 | map<perm_string,ivl_nature_t> access_function_nature; | |
| 6 | ||
| 7 | -static perm_string nature_name = perm_string::perm_string(); | |
| 8 | -static perm_string nature_access = perm_string::perm_string(); | |
| 9 | +static perm_string nature_name; | |
| 10 | +static perm_string nature_access; | |
| 11 | ||
| 12 | void pform_start_nature(const char*name) | |
| 13 | {
| |
| 14 | @@ -82,8 +82,8 @@ | |
| 15 | // expressions that use the access function can find it. | |
| 16 | access_function_nature[nature_access] = tmp; | |
| 17 | ||
| 18 | - nature_name = perm_string::perm_string(); | |
| 19 | - nature_access = perm_string::perm_string(); | |
| 20 | + nature_name = perm_string(); | |
| 21 | + nature_access = perm_string(); | |
| 22 | } | |
| 23 | ||
| 24 | ||
| 25 | @@ -171,7 +171,7 @@ | |
| 26 | FILE_NAME(tmp, loc); | |
| 27 | ||
| 28 | /* Clear the static variables for the next item. */ | |
| 29 | - discipline_name = perm_string::perm_string(); | |
| 30 | + discipline_name = perm_string(); | |
| 31 | discipline_domain = IVL_DIS_NONE; | |
| 32 | discipline_potential = 0; | |
| 33 | discipline_flow = 0; |
