From ac5bbaa76ee5f3499570e816b6a8b2875b1ad4b3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 17 Jan 2018 15:32:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3gmap=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=85=A8=E5=B1=80=E6=9B=BF=E6=8D=A2=E9=80=A0?= =?UTF-8?q?=E6=88=90=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- g/container/gmap/int_interface_map.go | 12 ++++++------ g/container/gmap/interface_interface_map.go | 12 ++++++------ g/container/gmap/string_interface_map.go | 12 ++++++------ g/container/gmap/uint_interface_map.go | 16 ++++++++-------- geg/encoding/gbinary/1.go | 1 + 5 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 geg/encoding/gbinary/1.go diff --git a/g/container/gmap/int_interface_map.go b/g/container/gmap/int_interface_map.go index cbb4bc351..694f0fe41 100644 --- a/g/container/gmap/int_interface_map.go +++ b/g/container/gmap/int_interface_map.go @@ -59,27 +59,27 @@ func (this *IntInterfaceMap) Get(key int) (interface{}) { } func (this *IntInterfaceMap) GetBool(key int) bool { - return gconv.Bool(this.mu.Get(key)) + return gconv.Bool(this.Get(key)) } func (this *IntInterfaceMap) GetInt(key int) int { - return gconv.Int(this.mu.Get(key)) + return gconv.Int(this.Get(key)) } func (this *IntInterfaceMap) GetUint (key int) uint { - return gconv.Uint(this.mu.Get(key)) + return gconv.Uint(this.Get(key)) } func (this *IntInterfaceMap) GetFloat32 (key int) float32 { - return gconv.Float32(this.mu.Get(key)) + return gconv.Float32(this.Get(key)) } func (this *IntInterfaceMap) GetFloat64 (key int) float64 { - return gconv.Float64(this.mu.Get(key)) + return gconv.Float64(this.Get(key)) } func (this *IntInterfaceMap) GetString (key int) string { - return gconv.String(this.mu.Get(key)) + return gconv.String(this.Get(key)) } // 删除键值对 diff --git a/g/container/gmap/interface_interface_map.go b/g/container/gmap/interface_interface_map.go index f5162e07e..2d97d21e2 100644 --- a/g/container/gmap/interface_interface_map.go +++ b/g/container/gmap/interface_interface_map.go @@ -59,27 +59,27 @@ func (this *InterfaceInterfaceMap) Get(key interface{}) (interface{}) { } func (this *InterfaceInterfaceMap) GetBool(key interface{}) bool { - return gconv.Bool(this.mu.Get(key)) + return gconv.Bool(this.Get(key)) } func (this *InterfaceInterfaceMap) GetInt(key interface{}) int { - return gconv.Int(this.mu.Get(key)) + return gconv.Int(this.Get(key)) } func (this *InterfaceInterfaceMap) GetUint (key interface{}) uint { - return gconv.Uint(this.mu.Get(key)) + return gconv.Uint(this.Get(key)) } func (this *InterfaceInterfaceMap) GetFloat32 (key interface{}) float32 { - return gconv.Float32(this.mu.Get(key)) + return gconv.Float32(this.Get(key)) } func (this *InterfaceInterfaceMap) GetFloat64 (key interface{}) float64 { - return gconv.Float64(this.mu.Get(key)) + return gconv.Float64(this.Get(key)) } func (this *InterfaceInterfaceMap) GetString (key interface{}) string { - return gconv.String(this.mu.Get(key)) + return gconv.String(this.Get(key)) } // 删除键值对 diff --git a/g/container/gmap/string_interface_map.go b/g/container/gmap/string_interface_map.go index 740738b4e..6b45a3938 100644 --- a/g/container/gmap/string_interface_map.go +++ b/g/container/gmap/string_interface_map.go @@ -59,27 +59,27 @@ func (this *StringInterfaceMap) Get(key string) interface{} { } func (this *StringInterfaceMap) GetBool(key string) bool { - return gconv.Bool(this.mu.Get(key)) + return gconv.Bool(this.Get(key)) } func (this *StringInterfaceMap) GetInt(key string) int { - return gconv.Int(this.mu.Get(key)) + return gconv.Int(this.Get(key)) } func (this *StringInterfaceMap) GetUint (key string) uint { - return gconv.Uint(this.mu.Get(key)) + return gconv.Uint(this.Get(key)) } func (this *StringInterfaceMap) GetFloat32 (key string) float32 { - return gconv.Float32(this.mu.Get(key)) + return gconv.Float32(this.Get(key)) } func (this *StringInterfaceMap) GetFloat64 (key string) float64 { - return gconv.Float64(this.mu.Get(key)) + return gconv.Float64(this.Get(key)) } func (this *StringInterfaceMap) GetString (key string) string { - return gconv.String(this.mu.Get(key)) + return gconv.String(this.Get(key)) } // 删除键值对 diff --git a/g/container/gmap/uint_interface_map.go b/g/container/gmap/uint_interface_map.go index baa0ed728..9586be69c 100644 --- a/g/container/gmap/uint_interface_map.go +++ b/g/container/gmap/uint_interface_map.go @@ -59,27 +59,27 @@ func (this *UintInterfaceMap) Get(key uint) (interface{}) { } func (this *UintInterfaceMap) GetBool(key uint) bool { - return gconv.Bool(this.mu.Get(key)) + return gconv.Bool(this.Get(key)) } func (this *UintInterfaceMap) GetInt(key uint) int { - return gconv.Int(this.mu.Get(key)) + return gconv.Int(this.Get(key)) } func (this *UintInterfaceMap) GetUint (key uint) uint { - return gconv.Uint(this.mu.Get(key)) + return gconv.Uint(this.Get(key)) } func (this *UintInterfaceMap) GetFloat32 (key uint) float32 { - return gconv.Float32(this.mu.Get(key)) + return gconv.Float32(this.Get(key)) } func (this *UintInterfaceMap) GetFloat64 (key uint) float64 { - return gconv.Float64(this.mu.Get(key)) + return gconv.Float64(this.Get(key)) } func (this *UintInterfaceMap) GetString (key uint) string { - return gconv.String(this.mu.Get(key)) + return gconv.String(this.Get(key)) } // 删除键值对 @@ -142,9 +142,9 @@ func (this *UintInterfaceMap) Contains(key uint) bool { // 哈希表大小 func (this *UintInterfaceMap) Size() int { this.mu.RLock() - len := len(this.m) + length := len(this.m) this.mu.RUnlock() - return len + return length } // 哈希表是否为空 diff --git a/geg/encoding/gbinary/1.go b/geg/encoding/gbinary/1.go new file mode 100644 index 000000000..72f10c46a --- /dev/null +++ b/geg/encoding/gbinary/1.go @@ -0,0 +1 @@ +package gbinary