From eb2181fd969faa01e28d11263592b022f178d848 Mon Sep 17 00:00:00 2001 From: trevor_hansen Date: Mon, 14 Sep 2009 14:42:42 +0000 Subject: [PATCH] * Build by defualt a 32-bit executable. * My last checkin doesn't compile. Get it compiling again. The 64-bit version has twice the peak memory usage of the 32-bit version on testcase15.stp.smt. git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@226 e59a4935-1847-0410-ae03-e826735625c1 --- scripts/Makefile.common | 2 +- src/AST/Transform.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/Makefile.common b/scripts/Makefile.common index ec45518..66b2cb0 100644 --- a/scripts/Makefile.common +++ b/scripts/Makefile.common @@ -39,7 +39,7 @@ ifeq ($(shell uname -s), DarwinX) CFLAGS = -isysroot $(UNIVERSAL_SDK) $(UNIVERSAL_ARCH) $(CFLAGS_BASE) else LDFLAGS = $(LDFLAGS_BASE) - CFLAGS = $(CFLAGS_BASE) + CFLAGS = $(CFLAGS_BASE) -m32 endif #CXXFLAGS = $(CFLAGS) -Wall -Wextra -DEXT_HASH_MAP -Wno-deprecated diff --git a/src/AST/Transform.cpp b/src/AST/Transform.cpp index 9dd11fa..d89a78f 100644 --- a/src/AST/Transform.cpp +++ b/src/AST/Transform.cpp @@ -38,7 +38,7 @@ namespace BEEV // up the cache that the others use. ASTNode BeevMgr::TransformFormula_TopLevel(const ASTNode& form) { - runTimes.start(RunTimes::TransformFormulaTopLevel); + runTimes.start(RunTimes::Transforming); assert(TransformMap == NULL); TransformMap = new ASTNodeMap(100); @@ -49,7 +49,7 @@ namespace BEEV delete TransformMap; TransformMap = NULL; - runTimes.stop(RunTimes::TransformFormulaTopLevel); + runTimes.stop(RunTimes::Transforming); return result; } @@ -190,7 +190,7 @@ namespace BEEV //Get the name of Boolean Var var.PL_Print(outVar); constant.PL_Print(outNum); - std::string str(outVar.str()); + std::string str(outVar.str()); str += "("; str += outNum.str(); str += ")"; @@ -304,7 +304,7 @@ namespace BEEV else { result = simpleForm; - } + } break; } default: -- 2.47.3