mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-23 11:37:54 +00:00
Code Activity

merge with master

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-03-25 14:57:01 -07:00
commit c513f3ca09
883 changed files with 13979 additions and 16480 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/tactic/model_converter.cpp
View file

@ -98,9 +98,9 @@ public:
};
model_converter * concat(model_converter * mc1, model_converter * mc2) {
if (mc1 == 0)
if (mc1 == nullptr)
return mc2;
if (mc2 == 0)
if (mc2 == nullptr)
return mc1;
return alloc(concat_model_converter, mc1, mc2);
}
@ -114,7 +114,7 @@ public:
model2mc(model * m, labels_vec const & r):m_model(m), m_labels(r) {}
virtual ~model2mc() {}
~model2mc() override {}
void operator()(model_ref & m) override {
m = m_model;