summaryrefslogtreecommitdiff
path: root/src/Network/BitTorrent/Core/PeerId.hs
diff options
context:
space:
mode:
authorSam Truzjan <pxqr.sta@gmail.com>2013-12-01 12:32:49 -0800
committerSam Truzjan <pxqr.sta@gmail.com>2013-12-01 12:32:49 -0800
commitf4fcc6c1970ec8d63e185e49dff65a6bd77011ad (patch)
tree5472de9cdb8afd6b15752f796ece829bf9e0316a /src/Network/BitTorrent/Core/PeerId.hs
parent2749007675a6ff28979fa793b48ffe910635c708 (diff)
parent5dc7a19e42da1ee1cc3570ca74a55c32d7d243e0 (diff)
Merge pull request #2 from DanielG/master
Fix building with aeson >= 0.6.2.0
Diffstat (limited to 'src/Network/BitTorrent/Core/PeerId.hs')
-rw-r--r--src/Network/BitTorrent/Core/PeerId.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Network/BitTorrent/Core/PeerId.hs b/src/Network/BitTorrent/Core/PeerId.hs
index 148f550d..1b4409a8 100644
--- a/src/Network/BitTorrent/Core/PeerId.hs
+++ b/src/Network/BitTorrent/Core/PeerId.hs
@@ -74,8 +74,8 @@ peerIdLen :: Int
74peerIdLen = 20 74peerIdLen = 20
75 75
76instance Hashable PeerId where 76instance Hashable PeerId where
77 hash = hash . getPeerId 77 hashWithSalt = hashUsing getPeerId
78 {-# INLINE hash #-} 78 {-# INLINE hashWithSalt #-}
79 79
80instance Serialize PeerId where 80instance Serialize PeerId where
81 put = putByteString . getPeerId 81 put = putByteString . getPeerId