Browse files

Merge pull request #61 from Taneb/patch-1

Allow hashable 1.2
  • Loading branch information...
2 parents 8c51dd3 + d107256 commit 61dbd49257fbda26d76613b0d4faa5db9eb50606 @gregorycollins gregorycollins committed Dec 22, 2012
Showing with 5 additions and 5 deletions.
  1. +1 −1 snap.cabal
  2. +4 −4 src/Control/Access/RoleBased/Internal/Role.hs
View
2 snap.cabal
@@ -150,7 +150,7 @@ Library
dlist >= 0.5 && < 0.6,
errors >= 1.3 && < 1.4,
filepath >= 1.1 && < 1.4,
- hashable >= 1.1 && < 1.2,
+ hashable >= 1.1 && < 1.3,
heist >= 0.10 && < 0.11,
lens >= 3.7.0.1 && < 3.8,
logict >= 0.4.2 && < 0.6,
View
8 src/Control/Access/RoleBased/Internal/Role.hs
@@ -26,11 +26,11 @@ instance IsString RoleValue where
------------------------------------------------------------------------------
instance Hashable RoleValue where
- hashWithSalt salt (RoleBool e) = hashWithSalt salt e `combine` 7
- hashWithSalt salt (RoleText t) = hashWithSalt salt t `combine` 196613
- hashWithSalt salt (RoleInt i) = hashWithSalt salt i `combine` 12582917
+ hashWithSalt salt (RoleBool e) = hashWithSalt salt e `hashWithSalt` (7 :: Int)
+ hashWithSalt salt (RoleText t) = hashWithSalt salt t `hashWithSalt` (196613 :: Int)
+ hashWithSalt salt (RoleInt i) = hashWithSalt salt i `hashWithSalt` (12582917 :: Int)
hashWithSalt salt (RoleDouble d) =
- hashWithSalt salt d `combine` 1610612741
+ hashWithSalt salt d `hashWithSalt` (1610612741 :: Int)
------------------------------------------------------------------------------

0 comments on commit 61dbd49

Please sign in to comment.