From 1d6b6c83e0b2a0ca5f1fcf75905028716d3a616a Mon Sep 17 00:00:00 2001 From: PBerger Date: Sat, 21 Sep 2013 01:38:42 +0200 Subject: [PATCH] Fixed header/implementation mismatches which Clang detects and can not ignore. This might introduce bugs, but it was my best guess as to what atrocity the author was trying to to there. Former-commit-id: 8d269a71e0441cb759fb48f030a3860b86b0fe95 --- resources/3rdparty/cudd-2.5.0/src/dddmp/dddmpInt.h | 2 +- resources/3rdparty/cudd-2.5.0/src/dddmp/dddmpStoreCnf.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/3rdparty/cudd-2.5.0/src/dddmp/dddmpInt.h b/resources/3rdparty/cudd-2.5.0/src/dddmp/dddmpInt.h index 7d0f54dfc..1ebab9a3c 100644 --- a/resources/3rdparty/cudd-2.5.0/src/dddmp/dddmpInt.h +++ b/resources/3rdparty/cudd-2.5.0/src/dddmp/dddmpInt.h @@ -190,7 +190,7 @@ extern int DddmpNumberDdNodesCnf(DdManager *ddMgr, DdNode **f, int rootN, int *c extern int DddmpDdNodesCountEdgesAndNumber(DdManager *ddMgr, DdNode **f, int rootN, int edgeInTh, int pathLengthTh, int *cnfIds, int id); extern void DddmpUnnumberDdNodesCnf(DdManager *ddMgr, DdNode **f, int rootN); extern int DddmpPrintBddAndNext(DdManager *ddMgr, DdNode **f, int rootN); -extern int DddmpWriteNodeIndexCnf(DdNode *f, int id); +extern int DddmpWriteNodeIndexCnfBis(DdNode *f, int id); extern int DddmpVisitedCnf(DdNode *f); extern void DddmpSetVisitedCnf(DdNode *f); extern int DddmpReadNodeIndexCnf(DdNode *f); diff --git a/resources/3rdparty/cudd-2.5.0/src/dddmp/dddmpStoreCnf.c b/resources/3rdparty/cudd-2.5.0/src/dddmp/dddmpStoreCnf.c index c952efdf3..35b9b6978 100644 --- a/resources/3rdparty/cudd-2.5.0/src/dddmp/dddmpStoreCnf.c +++ b/resources/3rdparty/cudd-2.5.0/src/dddmp/dddmpStoreCnf.c @@ -1486,7 +1486,7 @@ StoreCnfBestSharedRecur ( idf = DddmpReadNodeIndexCnf (node); if (idf > 0) { /* Cheat the Recur Function about the Index of the Current Node */ - DddmpWriteNodeIndexCnf (node, 0); + DddmpWriteNodeIndexCnfBis (node, 0); #if DDDMP_DEBUG_CNF fprintf (fp, "Else of XNOR\n"); @@ -1507,7 +1507,7 @@ StoreCnfBestSharedRecur ( fp, list, clauseN, varMax); /* Set Back Index of Current Node */ - DddmpWriteNodeIndexCnf (node, idf); + DddmpWriteNodeIndexCnfBis (node, idf); } /* Mark node as visited. */