Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
admpub committed Jan 18, 2021
1 parent 3dbd996 commit 5218296
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion decode.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ func (md *MetaData) unifyMap(mapping interface{}, rv reflect.Value) error {
if originalValue.IsValid() && originalValue.Kind() == reflect.Interface {
originalValue = reflect.ValueOf(originalValue.Interface())
if originalValue.Kind() == reflect.Ptr {
map2struct.Scan(originalValue.Interface(), mv)
map2struct.Scan(originalValue.Interface(), mv, `confl`, `json`)
rv.SetMapIndex(rvkey, originalValue)
continue
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/admpub/confl
go 1.15

require (
github.com/admpub/map2struct v0.0.0-20170301071106-6be1b201efe1
github.com/admpub/map2struct v0.0.3
github.com/araddon/gou v0.0.0-20190110011759-c797efecbb61
github.com/stretchr/testify v1.7.0
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/admpub/map2struct v0.0.0-20170301071106-6be1b201efe1 h1:fivYYVCvjM1HTWH7M8wEi9GvNKO7ckjttnAUNAqdRtw=
github.com/admpub/map2struct v0.0.0-20170301071106-6be1b201efe1/go.mod h1:ervwWz25v8EbX+eSQuEQTJ61QwsIk/D/Uv1f2IFhAzg=
github.com/admpub/map2struct v0.0.3 h1:KrKCFZgiiV54dEw0jpvCQn/HlUEI7rFHpEBE8MR7M0w=
github.com/admpub/map2struct v0.0.3/go.mod h1:SSikwpb+tMPLaqu59gh/edGWHKEbgcOIxiWWwJVUL+w=
github.com/araddon/gou v0.0.0-20190110011759-c797efecbb61 h1:Xz25cuW4REGC5W5UtpMU3QItMIImag615HiQcRbxqKQ=
github.com/araddon/gou v0.0.0-20190110011759-c797efecbb61/go.mod h1:ikc1XA58M+Rx7SEbf0bLJCfBkwayZ8T5jBo5FXK8Uz8=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
Expand Down

0 comments on commit 5218296

Please sign in to comment.