From b63727ff7a5d9b1f044911c0c5adb6245b1fc241 Mon Sep 17 00:00:00 2001
From: PHO <pho@cielonegro.org>
Date: Fri, 23 Apr 2010 01:48:59 +0900
Subject: [PATCH] do not use IncoherentInstances

---
 Database/RRDtool.hs | 6 ++----
 rrdtool.cabal       | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Database/RRDtool.hs b/Database/RRDtool.hs
index df0fc48..a1fc0ec 100644
--- a/Database/RRDtool.hs
+++ b/Database/RRDtool.hs
@@ -182,14 +182,12 @@ class (Show e, Eq e) => Expr e
 class Expr e => CommonExpr e
 class Expr e => IterativeExpr e
 class Expr e => AggregativeExpr e
-instance CommonExpr e => IterativeExpr e
 
 class (Show es, Eq es, HList es) => ExprSet es
 instance ExprSet HNil
 instance (Expr e, ExprSet es) => ExprSet (e :*: es)
 
 class (Show es, Eq es, HList es) => CommonExprSet es
-instance CommonExprSet es => ExprSet es
 instance CommonExprSet HNil
 instance (CommonExpr e, CommonExprSet es) => CommonExprSet (e :*: es)
 
@@ -298,7 +296,7 @@ data CommonSetOp es
     deriving (Show, Eq, Ord)
 
 instance ExprSet es => Expr (CommonSetOp es)
-instance CommonExprSet es => CommonExpr (CommonSetOp es)
+instance (ExprSet es, CommonExprSet es) => CommonExpr (CommonSetOp es)
 instance VariableSet (HConcat (HMap ApplyMentionedVarsOf es)) =>
     MentionedVars (CommonSetOp es) where
         type MentionedVarsOf (CommonSetOp es)
@@ -319,7 +317,7 @@ data VariableShiftPredictOp ss w vn
     deriving (Show, Eq, Ord)
 instance (ExprSet ss, Expr w, VarName vn)
     => Expr (VariableShiftPredictOp ss w vn)
-instance (CommonExprSet ss, CommonExpr w, VarName vn)
+instance (ExprSet ss, CommonExprSet ss, CommonExpr w, VarName vn)
     => CommonExpr (VariableShiftPredictOp ss w vn)
 instance ( VarName vn
          , VariableSet (MentionedVarsOf ss :++: MentionedVarsOf w)
diff --git a/rrdtool.cabal b/rrdtool.cabal
index 880db98..97b803b 100644
--- a/rrdtool.cabal
+++ b/rrdtool.cabal
@@ -33,11 +33,9 @@ Library
         ExistentialQuantification
         FlexibleContexts
         FlexibleInstances
-        IncoherentInstances
         MultiParamTypeClasses
         TypeFamilies
         TypeOperators
-        TypeSynonymInstances
         UndecidableInstances
 
     Exposed-Modules:
-- 
2.40.0