From dadb3a68d381e21a84aa9687906bc355dd8d1c48 Mon Sep 17 00:00:00 2001 From: Stephen Williams Date: Tue, 20 May 2008 10:41:24 -0700 Subject: [PATCH] Fix possible error choosing default discipline domain. Recent gcc warns about code that turns out to be incorrect. --- pform_disciplines.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pform_disciplines.cc b/pform_disciplines.cc index be07665d8..82f78708b 100644 --- a/pform_disciplines.cc +++ b/pform_disciplines.cc @@ -143,7 +143,7 @@ void pform_end_discipline(const struct vlltype&loc) { // If the domain is not otherwise specified, then take it to // be continuous if potential or flow natures are given. - if (discipline_domain == DD_NONE && discipline_potential||discipline_flow) + if (discipline_domain == DD_NONE && (discipline_potential||discipline_flow)) discipline_domain = DD_CONTINUOUS; discipline_t*tmp = new discipline_t(discipline_name, discipline_domain,