From fab794cb2cad61bfedf096542f80c5075feca70c Mon Sep 17 00:00:00 2001 From: "Robert (Jamie) Munro" Date: Wed, 7 Sep 2016 17:19:46 +0100 Subject: [PATCH 1/2] .gitignore all the libs downloadable by Makefile i.e. by doing: make minisat2-download make glucose-download make zlib-download make libzip-download --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index fa3ac7098d6..e2a69b509f6 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,12 @@ src/big-int/test-bigint.exe # files stored by editors *~ + +# libs downloaded by make [name]-download libzip/ +zlib/ +minisat*/ +glucose-syrup/ # flex/bison generated files src/ansi-c/ansi_c_lex.yy.cpp From 47a245da237253ed334aa28fb347b0d6ec085a10 Mon Sep 17 00:00:00 2001 From: "Robert (Jamie) Munro" Date: Tue, 20 Sep 2016 17:02:32 +0100 Subject: [PATCH 2/2] Fix typo --- src/java_bytecode/java_bytecode_convert_method.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java_bytecode/java_bytecode_convert_method.cpp b/src/java_bytecode/java_bytecode_convert_method.cpp index 699c6556b80..d881574dd75 100644 --- a/src/java_bytecode/java_bytecode_convert_method.cpp +++ b/src/java_bytecode/java_bytecode_convert_method.cpp @@ -232,7 +232,7 @@ size_t get_variable_slots(const code_typet::parametert ¶m) return count_slots(0, param); } -bool is_contructor(const class_typet::methodt &method) +bool is_constructor(const class_typet::methodt &method) { const std::string &name(id2string(method.get_name())); const std::string::size_type &npos(std::string::npos); @@ -382,7 +382,7 @@ void java_bytecode_convert_methodt::convert( method.set(ID_abstract, m.is_abstract); method.set(ID_is_virtual, is_virtual); - if(is_contructor(method)) + if(is_constructor(method)) method.set(ID_constructor, true); method.type()=member_type;