Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix usage on android API <19 #119

Merged
merged 3 commits into from
Jun 27, 2017
Merged

fix usage on android API <19 #119

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
304ccc9
fix usage on android 4.x
ffgiraldez Jun 25, 2017
862fdf8
remove import
ffgiraldez Jun 25, 2017
3d6af17
Merge branch 'master' into fix-build-android-4.x
ffgiraldez Jun 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions kategory/src/main/kotlin/kategory/typeclasses/Typeclass.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package kategory
import java.lang.reflect.ParameterizedType
import java.lang.reflect.Type
import java.util.Arrays
import java.util.Objects
import java.util.concurrent.ConcurrentHashMap

/**
Expand Down Expand Up @@ -62,8 +61,8 @@ class InstanceParametrizedType(val raw: Type, val typeArgs: List<Type>) : Parame

override fun hashCode(): Int {
return Arrays.hashCode(actualTypeArguments) xor
Objects.hashCode(ownerType) xor
Objects.hashCode(rawType)
hashCode(ownerType) xor
hashCode(rawType)
}

override fun toString(): String {
Expand Down Expand Up @@ -102,6 +101,10 @@ class InstanceParametrizedType(val raw: Type, val typeArgs: List<Type>) : Parame
return sb.toString()
}

fun hashCode(o: Any?): Int {
return o?.hashCode() ?: 0
}

}

/**
Expand Down