From 9d52cff1bb2f76ba3d6a0329c4b1ef5ef7baf6bb Mon Sep 17 00:00:00 2001 From: Catherine Galkina Date: Tue, 13 Dec 2016 17:50:41 +0300 Subject: [PATCH] Fix ghc-7.8.4 build --- servant-client/src/Servant/Client/Generic.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/servant-client/src/Servant/Client/Generic.hs b/servant-client/src/Servant/Client/Generic.hs index 31a7fa1d..406e0fe3 100644 --- a/servant-client/src/Servant/Client/Generic.hs +++ b/servant-client/src/Servant/Client/Generic.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE FlexibleContexts #-} @@ -6,6 +7,9 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} + +#include "overlapping-compat.h" + module Servant.Client.Generic ( ClientLike(..) , genericMkClientL @@ -142,7 +146,7 @@ instance (GClientList b acc, GClientList a (ClientList b acc)) => GClientList (a :<|> b) acc where gClientList (a :<|> b) acc = gClientList a (gClientList b acc) -instance {-# OVERLAPPABLE #-} (ClientList client acc ~ (client ': acc)) +instance OVERLAPPABLE_ (ClientList client acc ~ (client ': acc)) => GClientList client acc where gClientList c acc = I c :* acc