From 957c3be02fb7307d2eb544064dcbb84186563d09 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Sat, 16 Mar 2019 16:52:18 -0700 Subject: [PATCH] build errors/warnings Signed-off-by: Nikolaj Bjorner --- src/api/dotnet/Properties/AssemblyInfo.cs.in | 4 ++-- src/ast/rewriter/rewriter_def.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api/dotnet/Properties/AssemblyInfo.cs.in b/src/api/dotnet/Properties/AssemblyInfo.cs.in index e5a85f16f..5c3f02cfd 100644 --- a/src/api/dotnet/Properties/AssemblyInfo.cs.in +++ b/src/api/dotnet/Properties/AssemblyInfo.cs.in @@ -34,5 +34,5 @@ using System.Security.Permissions; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("4.2.0.0")] -[assembly: AssemblyVersion("@VER_MAJOR@.@VER_MINOR@.@VER_BUILD@.@VER_REVISION@")] -[assembly: AssemblyFileVersion("@VER_MAJOR@.@VER_MINOR@.@VER_BUILD@.@VER_REVISION@")] +[assembly: AssemblyVersion("@VER_MAJOR@.@VER_MINOR@.@VER_BUILD@.@VER_TWEAK@")] +[assembly: AssemblyFileVersion("@VER_MAJOR@.@VER_MINOR@.@VER_BUILD@.@VER_TWEAK@")] diff --git a/src/ast/rewriter/rewriter_def.h b/src/ast/rewriter/rewriter_def.h index f628c2225..2f0d9c659 100644 --- a/src/ast/rewriter/rewriter_def.h +++ b/src/ast/rewriter/rewriter_def.h @@ -82,14 +82,14 @@ template template bool rewriter_tpl::process_const(app * t0) { app_ref t(t0, m()); - bool rounds = 0; + bool retried = false; retry: SASSERT(t->get_num_args() == 0); br_status st = m_cfg.reduce_app(t->get_decl(), 0, nullptr, m_r, m_pr); SASSERT(st != BR_DONE || m().get_sort(m_r) == m().get_sort(t)); switch (st) { case BR_FAILED: - if (rounds == 0) { + if (!retried) { result_stack().push_back(t); if (ProofGen) result_pr_stack().push_back(nullptr); // implicit reflexivity @@ -112,7 +112,7 @@ bool rewriter_tpl::process_const(app * t0) { default: if (is_app(m_r) && to_app(m_r)->get_num_args() == 0) { t = to_app(m_r); - rounds++; + retried = true; goto retry; } return false;