9d52cff · servant · git.iko.soy

git.iko.soy/servant

on master help sign in

Fix ghc-7.8.4 build

9d52cffCatherine Galkina10 years ago

servant-client/src/Servant/Client/Generic.hs+5−1

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DefaultSignatures #-}

3{-# LANGUAGE DefaultSignatures #-}

3{-# LANGUAGE FlexibleContexts #-}

4{-# LANGUAGE FlexibleContexts #-}

@@ -6,6 +7,9 @@

6{-# LANGUAGE TypeFamilies #-}

7{-# LANGUAGE TypeFamilies #-}

7{-# LANGUAGE TypeOperators #-}

8{-# LANGUAGE TypeOperators #-}

8{-# LANGUAGE UndecidableInstances #-}

9{-# LANGUAGE UndecidableInstances #-}

10+

11+#include "overlapping-compat.h"

12+

9module Servant.Client.Generic

13module Servant.Client.Generic

10 ( ClientLike(..)

14 ( ClientLike(..)

11 , genericMkClientL

15 , genericMkClientL

@@ -142,7 +146,7 @@ instance (GClientList b acc, GClientList a (ClientList b acc))

142 => GClientList (a :<|> b) acc where

146 => GClientList (a :<|> b) acc where

143 gClientList (a :<|> b) acc = gClientList a (gClientList b acc)

147 gClientList (a :<|> b) acc = gClientList a (gClientList b acc)

144

148

145−instance {-# OVERLAPPABLE #-} (ClientList client acc ~ (client ': acc))

149+instance OVERLAPPABLE_ (ClientList client acc ~ (client ': acc))

146 => GClientList client acc where

150 => GClientList client acc where

147 gClientList c acc = I c :* acc

151 gClientList c acc = I c :* acc

148

152