From b855b0368d8574f21fe1a19afe09ef82c2c0418d Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Wed, 13 Jan 2010 20:23:36 +0000 Subject: [PATCH] Fix build with gcc-4.5 New version of GCC does not like the X::X() construct. --- pform_disciplines.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pform_disciplines.cc b/pform_disciplines.cc index 73a23b504..c05ff1373 100644 --- a/pform_disciplines.cc +++ b/pform_disciplines.cc @@ -27,8 +27,8 @@ map natures; map disciplines; map 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;