1
0
mirror of https://github.com/json-iterator/go.git synced 2025-01-23 18:54:21 +02:00

fix build

This commit is contained in:
Tao Wen 2018-01-04 17:18:16 +08:00
parent 11c1cce0d8
commit 6dad2de6cc
2 changed files with 2 additions and 1 deletions

View File

@ -384,6 +384,7 @@ type nonEmptyInterfaceCodec struct {
func (codec *nonEmptyInterfaceCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
if iter.WhatIsNext() == NilValue {
iter.skipFourBytes('n', 'u', 'l', 'l')
*((*interface{})(ptr)) = nil
return
}
nonEmptyInterface := (*nonEmptyInterface)(ptr)

View File

@ -408,7 +408,7 @@ func Test_omitempty_nil_nonempty_interface(t *testing.T) {
obj.Field = MyString("hello")
err = UnmarshalFromString(`{"field":null}`, &obj)
should.NoError(err)
should.Equal(nil, obj.Field)
should.Nil(obj.Field)
}
func Test_marshal_nil_marshaler_interface(t *testing.T) {