diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2013-09-15 23:05:05 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2013-09-17 09:54:07 +0200 |
| commit | 0f5eae0232a86ec57d841a83e6929361e2751270 (patch) | |
| tree | 7cc7b87fce8238cd9ff6b65fb0c37f515191aa6e /libraries/base/Data/Proxy.hs | |
| parent | 43ece172e7045d5ba633be6193f3e908eaa81f00 (diff) | |
| download | haskell-0f5eae0232a86ec57d841a83e6929361e2751270.tar.gz | |
Constant-fold `__GLASGOW_HASKELL__` CPP conditionals
Now that HUGS and NHC specific code has been removed, this commit "folds"
the now redundant `#if((n)def)`s containing `__GLASGOW_HASKELL__`. This
renders `base` officially GHC only.
This commit also removes redundant `{-# LANGUAGE CPP #-}`.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Diffstat (limited to 'libraries/base/Data/Proxy.hs')
| -rw-r--r-- | libraries/base/Data/Proxy.hs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libraries/base/Data/Proxy.hs b/libraries/base/Data/Proxy.hs index bda295e41f..083db91291 100644 --- a/libraries/base/Data/Proxy.hs +++ b/libraries/base/Data/Proxy.hs @@ -1,7 +1,5 @@ {-# LANGUAGE NoImplicitPrelude, Trustworthy #-} -#ifdef __GLASGOW_HASKELL__ {-# LANGUAGE PolyKinds #-} -#endif ----------------------------------------------------------------------------- -- | @@ -19,9 +17,7 @@ module Data.Proxy ( Proxy(..), asProxyTypeOf -#ifdef __GLASGOW_HASKELL__ , KProxy(..) -#endif ) where import Data.Monoid @@ -35,11 +31,9 @@ import GHC.Arr -- | A concrete, poly-kinded proxy type data Proxy t = Proxy -#ifdef __GLASGOW_HASKELL__ -- | A concrete, promotable proxy type, for use at the kind level -- There are no instances for this because it is intended at the kind level only data KProxy (t :: *) = KProxy -#endif instance Eq (Proxy s) where _ == _ = True @@ -69,10 +63,8 @@ instance Ix (Proxy s) where index _ _ = 0 inRange _ _ = True rangeSize _ = 1 -#ifdef __GLASGOW_HASKELL__ unsafeIndex _ _ = 0 unsafeRangeSize _ = 1 -#endif instance Bounded (Proxy s) where minBound = Proxy @@ -102,4 +94,4 @@ instance Monad Proxy where -- of the second. asProxyTypeOf :: a -> Proxy a -> a asProxyTypeOf = const -{-# INLINE asProxyTypeOf #-}
\ No newline at end of file +{-# INLINE asProxyTypeOf #-} |