mirror of
https://github.com/gentoo-mirror/guru.git
synced 2025-04-20 23:46:14 -04:00
81 lines
3.0 KiB
Diff
81 lines
3.0 KiB
Diff
From b3db0dd1dc2e4b569e98d91a7909c274a2e3f3ad Mon Sep 17 00:00:00 2001
|
|
From: Quoc-Sang Phan <qsp@Quoc-Sangs-MBP.sv.cmu.local>
|
|
Date: Wed, 30 Sep 2015 14:35:05 -0700
|
|
Subject: [PATCH] remove default argument of friend function on Mac
|
|
|
|
---
|
|
omega_lib/include/omega/pres_conj.h | 2 +-
|
|
omega_lib/src/pres_beaut.c | 2 +-
|
|
omega_lib/src/pres_dnf.c | 10 +++++-----
|
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
--- a/omega_lib/include/omega/pres_conj.h
|
|
+++ b/omega_lib/include/omega/pres_conj.h
|
|
@@ -263,7 +263,7 @@ class Conjunct : public F_Declaration {
|
|
friend int simplify_conj(Conjunct* conj, int ver_sim, int elim_red, int color);
|
|
friend DNF* negate_conj(Conjunct* conj);
|
|
friend Conjunct* merge_conjs(Conjunct* conj1, Conjunct* conj2,
|
|
- Merge_Action action, Rel_Body *body = 0);
|
|
+ Merge_Action action, Rel_Body *body);
|
|
friend void copy_conj_header(Conjunct* to, Conjunct* fr);
|
|
|
|
|
|
--- a/omega_lib/src/pres_beaut.c
|
|
+++ b/omega_lib/src/pres_beaut.c
|
|
@@ -168,7 +168,7 @@ void F_And::beautify()
|
|
{
|
|
Conjunct *conj1 = merge_conjs(conj,
|
|
f->really_conjunct(),
|
|
- MERGE_REGULAR);
|
|
+ MERGE_REGULAR,0);
|
|
delete f;
|
|
delete conj;
|
|
conj = conj1;
|
|
--- a/omega_lib/src/pres_dnf.c
|
|
+++ b/omega_lib/src/pres_dnf.c
|
|
@@ -97,7 +97,7 @@ void DNF::rm_redundant_conjs(int effort) {
|
|
}
|
|
else {
|
|
|
|
- Conjunct *cgist = merge_conjs(cdel, c, MERGE_GIST);
|
|
+ Conjunct *cgist = merge_conjs(cdel, c, MERGE_GIST, 0);
|
|
|
|
if (!cgist->redSimplifyProblem(effort,0)) {
|
|
if(pres_debug) {
|
|
@@ -314,7 +314,7 @@ void DNF::clear()
|
|
DNF* DNF_and_conj(DNF* dnf, Conjunct* conj) {
|
|
DNF* new_dnf = new DNF;
|
|
for(DNF_Iterator p(dnf); p.live(); p.next()) {
|
|
- Conjunct* new_conj = merge_conjs(p.curr(), conj, MERGE_REGULAR);
|
|
+ Conjunct* new_conj = merge_conjs(p.curr(), conj, MERGE_REGULAR, 0);
|
|
new_dnf->add_conjunct(new_conj);
|
|
}
|
|
if(new_dnf->length() > 1) {
|
|
@@ -364,7 +364,7 @@ DNF* conj_and_not_dnf(Conjunct *positive_conjunct, DNF *neg_conjs, bool weak) {
|
|
p.curr_set(NULL);
|
|
continue;
|
|
}
|
|
- Conjunct *cgist = merge_conjs(positive_conjunct, neg_conj, MERGE_GIST);
|
|
+ Conjunct *cgist = merge_conjs(positive_conjunct, neg_conj, MERGE_GIST, 0);
|
|
if(simplify_conj(cgist, false, true, _red) == false)
|
|
{
|
|
delete cgist;
|
|
@@ -389,7 +389,7 @@ DNF* conj_and_not_dnf(Conjunct *positive_conjunct, DNF *neg_conjs, bool weak) {
|
|
delete cgist;
|
|
Conjunct *conj =
|
|
merge_conjs(positive_conjunct, neg_dnf->single_conjunct(),
|
|
- MERGE_REGULAR);
|
|
+ MERGE_REGULAR, 0);
|
|
delete positive_conjunct;
|
|
delete neg_dnf;
|
|
positive_conjunct = conj;
|
|
@@ -795,7 +795,7 @@ DNF* F_And::DNFize()
|
|
}
|
|
else
|
|
{
|
|
- Conjunct *new_conj = merge_conjs(positive_conjunct, conj, MERGE_REGULAR);
|
|
+ Conjunct *new_conj = merge_conjs(positive_conjunct, conj, MERGE_REGULAR, 0);
|
|
delete conj;
|
|
delete positive_conjunct;
|
|
positive_conjunct = new_conj;
|