[commit: packages/containers] ghc-head: Do not use Typeable1..3 in GHC >= 7.7 (d016ae0)

git at git.haskell.org git at git.haskell.org
Wed Sep 4 21:24:34 CEST 2013


Repository : ssh://git@git.haskell.org/containers

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/containers.git;a=commit;h=d016ae0b7ac5e002462af48b30dcc55ede2c1e1d

>---------------------------------------------------------------

commit d016ae0b7ac5e002462af48b30dcc55ede2c1e1d
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Tue Feb 12 13:21:39 2013 +0000

    Do not use Typeable1..3 in GHC >= 7.7


>---------------------------------------------------------------

d016ae0b7ac5e002462af48b30dcc55ede2c1e1d
 include/Typeable.h |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/Typeable.h b/include/Typeable.h
index d21804c..7c74743 100644
--- a/include/Typeable.h
+++ b/include/Typeable.h
@@ -20,9 +20,15 @@
 --  // generate the instances.
 
 #define INSTANCE_TYPEABLE0(tycon,tcname,str) deriving instance Typeable tycon
+#if __GLASGOW_HASKELL__ >= 707
+#define INSTANCE_TYPEABLE1(tycon,tcname,str) deriving instance Typeable tycon
+#define INSTANCE_TYPEABLE2(tycon,tcname,str) deriving instance Typeable tycon
+#define INSTANCE_TYPEABLE3(tycon,tcname,str) deriving instance Typeable tycon
+#else
 #define INSTANCE_TYPEABLE1(tycon,tcname,str) deriving instance Typeable1 tycon
 #define INSTANCE_TYPEABLE2(tycon,tcname,str) deriving instance Typeable2 tycon
 #define INSTANCE_TYPEABLE3(tycon,tcname,str) deriving instance Typeable3 tycon
+#endif
 
 #else /* !__GLASGOW_HASKELL__ */
 





More information about the ghc-commits mailing list