diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-22 15:30:59 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-22 15:30:59 +0000 |
| commit | a562641c0dfbee57550a4b4d99f82acd3da99503 (patch) | |
| tree | 03bbe2fa5c59a96c823f83b08089d54bbe0fe85b /libgo/go/asn1/asn1.go | |
| parent | 3edafd46128542d863667585f9a89284fdbd1af2 (diff) | |
| download | gcc-a562641c0dfbee57550a4b4d99f82acd3da99503.tar.gz | |
2011-01-22 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 169126
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@169127 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/asn1/asn1.go')
| -rw-r--r-- | libgo/go/asn1/asn1.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgo/go/asn1/asn1.go b/libgo/go/asn1/asn1.go index b26eb0987d1..d06b1d4d776 100644 --- a/libgo/go/asn1/asn1.go +++ b/libgo/go/asn1/asn1.go @@ -591,7 +591,7 @@ func parseField(v reflect.Value, bytes []byte, initOffset int, params fieldParam sliceValue := v.(*reflect.SliceValue) sliceValue.Set(reflect.MakeSlice(sliceValue.Type().(*reflect.SliceType), len(newSlice), len(newSlice))) if err1 == nil { - reflect.ArrayCopy(sliceValue, reflect.NewValue(newSlice).(reflect.ArrayOrSliceValue)) + reflect.Copy(sliceValue, reflect.NewValue(newSlice).(reflect.ArrayOrSliceValue)) } err = err1 return @@ -683,7 +683,7 @@ func parseField(v reflect.Value, bytes []byte, initOffset int, params fieldParam sliceType := fieldType.(*reflect.SliceType) if sliceType.Elem().Kind() == reflect.Uint8 { val.Set(reflect.MakeSlice(sliceType, len(innerBytes), len(innerBytes))) - reflect.ArrayCopy(val, reflect.NewValue(innerBytes).(reflect.ArrayOrSliceValue)) + reflect.Copy(val, reflect.NewValue(innerBytes).(reflect.ArrayOrSliceValue)) return } newSlice, err1 := parseSequenceOf(innerBytes, sliceType, sliceType.Elem()) |