From f1b4a985be64e08b1a440b1eaf75d3f8e2105d01 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Fri, 8 Jun 2012 20:11:22 +0000 Subject: [PATCH] minor fixes, for Mac OS --- src/bindings/Makefile.am | 2 +- src/util/node_visitor.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am index 74a9934e7..82c45fe92 100644 --- a/src/bindings/Makefile.am +++ b/src/bindings/Makefile.am @@ -211,7 +211,7 @@ $(patsubst %,%.cpp,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))): %.cpp: @srcdi $(AM_V_GEN)$(SWIG) -Wall -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. -c++ -$(patsubst %.cpp,%,$@) -outdir $(patsubst %.cpp,%,$@) $($(subst .,_,$@)_SWIGFLAGS) -o $@ $< $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))): %.d: @srcdir@/../cvc4.i - $(AM_V_GEN)$(SWIG) -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. -c++ -MM -o $(patsubst %.d,%.cpp,$@) $< + $(AM_V_GEN)$(SWIG) -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. -c++ -$(patsubst %.d,%,$@) -MM -o $(patsubst %.d,%.cpp,$@) $< # .PHONY so they get rebuilt each time .PHONY: .swig_deps $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))) .swig_deps: $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))) diff --git a/src/util/node_visitor.h b/src/util/node_visitor.h index 245c81224..5e04f820d 100644 --- a/src/util/node_visitor.h +++ b/src/util/node_visitor.h @@ -69,7 +69,7 @@ public: */ static typename Visitor::return_type run(Visitor& visitor, TNode node) { - GuardReentry guard(d_inRun); + GuardReentry guard(bool(d_inRun)); // Notify of a start visitor.start(node); -- 2.30.2