Refresh 0001-Fix-FTBFS-on-32-bit-architectures.patch
Anthony Fok
6 years ago
| 0 | 0 | From: "Dr. Tobias Quathamer" <toddy@debian.org> |
| 1 | 1 | Date: Wed, 26 Apr 2017 21:56:15 +0200 |
| 2 | 2 | Subject: Fix FTBFS on 32 bit architectures. |
| 3 | Forwarded: https://github.com/spf13/viper/pull/340 | |
| 4 | Reviewed-by: Anthony Fok <foka@debian.org> | |
| 5 | Last-Update: 2017-07-21 | |
| 3 | 6 | |
| 4 | 7 | --- |
| 5 | 8 | viper.go | 4 +++- |
| 6 | 9 | viper_test.go | 8 -------- |
| 7 | 10 | 2 files changed, 3 insertions(+), 9 deletions(-) |
| 8 | 11 | |
| 9 | diff --git a/viper.go b/viper.go | |
| 10 | index 2603c78..b176b8e 100644 | |
| 11 | 12 | --- a/viper.go |
| 12 | 13 | +++ b/viper.go |
| 13 | @@ -605,8 +605,10 @@ func (v *Viper) Get(key string) interface{} { | |
| 14 | return cast.ToBool(val) | |
| 15 | case string: | |
| 16 | return cast.ToString(val) | |
| 17 | - case int64, int32, int16, int8, int: | |
| 18 | + case int32, int16, int8, int: | |
| 19 | return cast.ToInt(val) | |
| 20 | + case int64: | |
| 21 | + return cast.ToInt64(val) | |
| 22 | case float64, float32: | |
| 23 | return cast.ToFloat64(val) | |
| 24 | case time.Time: | |
| 25 | diff --git a/viper_test.go b/viper_test.go | |
| 26 | index cd7b65c..189b499 100644 | |
| 14 | @@ -611,8 +611,10 @@ | |
| 15 | return cast.ToBool(val) | |
| 16 | case string: | |
| 17 | return cast.ToString(val) | |
| 18 | - case int64, int32, int16, int8, int: | |
| 19 | + case int32, int16, int8, int: | |
| 20 | return cast.ToInt(val) | |
| 21 | + case int64: | |
| 22 | + return cast.ToInt64(val) | |
| 23 | case float64, float32: | |
| 24 | return cast.ToFloat64(val) | |
| 25 | case time.Time: | |
| 27 | 26 | --- a/viper_test.go |
| 28 | 27 | +++ b/viper_test.go |
| 29 | @@ -841,10 +841,6 @@ func TestMergeConfig(t *testing.T) { | |
| 28 | @@ -879,10 +879,6 @@ | |
| 30 | 29 | t.Fatalf("pop != 37890, = %d", pop) |
| 31 | 30 | } |
| 32 | 31 | |
| 37 | 36 | if pop := v.GetInt64("hello.lagrenum"); pop != int64(765432101234567) { |
| 38 | 37 | t.Fatalf("int64 lagrenum != 765432101234567, = %d", pop) |
| 39 | 38 | } |
| 40 | @@ -865,10 +861,6 @@ func TestMergeConfig(t *testing.T) { | |
| 39 | @@ -903,10 +899,6 @@ | |
| 41 | 40 | t.Fatalf("pop != 45000, = %d", pop) |
| 42 | 41 | } |
| 43 | 42 | |