Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/z3prover/z3
Browse files Browse the repository at this point in the history
  • Loading branch information
NikolajBjorner committed Aug 19, 2022
2 parents 600b449 + 540e36e commit 514eaf3
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cmake_minimum_required(VERSION 3.4)

set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake")
project(Z3 VERSION 4.11.0.0 LANGUAGES CXX)
project(Z3 VERSION 4.11.1.0 LANGUAGES CXX)

################################################################################
# Project version
Expand Down
2 changes: 1 addition & 1 deletion scripts/mk_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from mk_util import *

def init_version():
set_version(4, 11, 0, 0)
set_version(4, 11, 1, 0)

# Z3 Project definition
def init_project_def():
Expand Down
2 changes: 1 addition & 1 deletion scripts/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ variables:

Major: '4'
Minor: '11'
Patch: '0'
Patch: '1'
NightlyVersion: $(Major).$(Minor).$(Patch).$(Build.BuildId)-$(Build.DefinitionName)

stages:
Expand Down
2 changes: 1 addition & 1 deletion scripts/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
trigger: none

variables:
ReleaseVersion: '4.11.0'
ReleaseVersion: '4.11.1'

stages:

Expand Down
2 changes: 2 additions & 0 deletions src/math/simplex/model_based_opt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1624,6 +1624,8 @@ namespace opt {
solve(row_id1, a, row_id2, x);
break;
case t_divides:
case t_mod:
case t_div:
// mod reduction already done.
UNREACHABLE();
break;
Expand Down

0 comments on commit 514eaf3

Please sign in to comment.