diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-03-26 18:35:33 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2014-03-26 18:35:33 -0400 |
| commit | c4f976a5c8338042f92da98bc54266ff55652833 (patch) | |
| tree | 440036fb1bcf849c589a66729816146d3d73d5d3 /src | |
| parent | 1cadb3c1034a9a5b0a778b25769ab1a8101de4f1 (diff) | |
| parent | e347f43940c53a8dfdaa022bc19900fcee631c08 (diff) | |
Merge branch '1.3.x'
Conflicts:
src/theory/arith/normal_form.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/Makefile.am | 2 | ||||
| -rw-r--r-- | src/theory/logic_info.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/Makefile.am b/src/main/Makefile.am index 7e87fa59a..3ac0db7cb 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am @@ -37,7 +37,7 @@ pcvc4_LDADD += \ @builddir@/../lib/libreplacements.la endif pcvc4_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS) -DPORTFOLIO_BUILD -pcvc4_LDADD += $(BOOST_THREAD_LIBS) -lpthread +pcvc4_LDADD += $(BOOST_THREAD_LIBS) pcvc4_LDADD += $(BOOST_THREAD_LDFLAGS) if STATIC_BINARY diff --git a/src/theory/logic_info.cpp b/src/theory/logic_info.cpp index a30867ee1..c079eecf9 100644 --- a/src/theory/logic_info.cpp +++ b/src/theory/logic_info.cpp @@ -157,7 +157,9 @@ void LogicInfo::setLogicString(std::string logicString) throw(IllegalArgumentExc enableTheory(THEORY_BOOL); const char* p = logicString.c_str(); - if(!strcmp(p, "QF_SAT") || *p == '\0') { + if(*p == '\0') { + // propositional logic only; we're done. + } else if(!strcmp(p, "QF_SAT")) { // propositional logic only; we're done. p += 6; } else if(!strcmp(p, "QF_ALL_SUPPORTED")) { |