bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-06 02:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
John
2019-02-01 17:55:06 +08:00
parent 74a7f71894 1dc6c799e1
commit e1166a8a80
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
g/container/garray/garray_sorted_int.go
View File

@ -206,10 +206,10 @@ func (a *SortedIntArray) binSearch(value int, lock bool) (index int, result int)
for min <= max {
mid = int((min + max) / 2)
cmp = a.compareFunc(value, a.array[mid])
switch cmp {
case -1 : max = mid - 1
case 1 : min = mid + 1
case 0 :
switch {
case cmp < 0 : max = mid - 1
case cmp > 0 : min = mid + 1
default :
return mid, cmp
}
}

8
g/container/garray/garray_sorted_interface.go
View File

@ -205,10 +205,10 @@ func (a *SortedArray) binSearch(value interface{}, lock bool)(index int, result
for min <= max {
mid = int((min + max) / 2)
cmp = a.compareFunc(value, a.array[mid])
switch cmp {
case -1 : max = mid - 1
case 1 : min = mid + 1
case 0 :
switch {
case cmp < 0 : max = mid - 1
case cmp > 0 : min = mid + 1
default :
return mid, cmp
}
}

8
g/container/garray/garray_sorted_string.go
View File

@ -199,10 +199,10 @@ func (a *SortedStringArray) binSearch(value string, lock bool) (index int, resul
for min <= max {
mid = int((min + max) / 2)
cmp = a.compareFunc(value, a.array[mid])
switch cmp {
case -1 : max = mid - 1
case 1 : min = mid + 1
case 0 :
switch {
case cmp < 0 : max = mid - 1
case cmp > 0 : min = mid + 1
default :
return mid, cmp
}
}

2
version.go
View File

@ -1,5 +1,5 @@
package gf
const VERSION = "v1.4.6.1"
const VERSION = "v1.4.7"
const AUTHORS = "john<john@goframe.org>"