Fix build with gcc-4.5

New version of GCC does not like the X::X() construct.
(cherry picked from commit b855b0368d)
This commit is contained in:
Nick Gasson
2010-01-25 14:47:04 -08:00
committed by Stephen Williams
parent 03411aba85
commit 2be20d49ed
+5 -5
View File
@@ -27,8 +27,8 @@ map<perm_string,ivl_nature_t> natures;
map<perm_string,ivl_discipline_t> disciplines;
map<perm_string,ivl_nature_t> access_function_nature;
static perm_string nature_name = perm_string::perm_string();
static perm_string nature_access = perm_string::perm_string();
static perm_string nature_name = perm_string();
static perm_string nature_access = perm_string();
void pform_start_nature(const char*name)
{
@@ -82,8 +82,8 @@ void pform_end_nature(const struct vlltype&loc)
// expressions that use the access function can find it.
access_function_nature[nature_access] = tmp;
nature_name = perm_string::perm_string();
nature_access = perm_string::perm_string();
nature_name = perm_string();
nature_access = perm_string();
}
@@ -171,7 +171,7 @@ void pform_end_discipline(const struct vlltype&loc)
FILE_NAME(tmp, loc);
/* Clear the static variables for the next item. */
discipline_name = perm_string::perm_string();
discipline_name = perm_string();
discipline_domain = IVL_DIS_NONE;
discipline_potential = 0;
discipline_flow = 0;