From 40c98255c234dc3bf854dfdedf95c6b6f831c27f Mon Sep 17 00:00:00 2001
From: Sidharth Kapur <sidharthkapur1@gmail.com>
Date: Mon, 21 Mar 2016 14:12:24 -0500
Subject: Remove BINARY ifdefs and CPP pragmas

---
 packages/base/hmatrix.cabal           | 1 -
 packages/base/src/Internal/Element.hs | 3 ---
 packages/base/src/Internal/Numeric.hs | 1 -
 packages/base/src/Internal/Vector.hs  | 6 +-----
 4 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'packages')

diff --git a/packages/base/hmatrix.cabal b/packages/base/hmatrix.cabal
index aba6fa7..faf84e8 100644
--- a/packages/base/hmatrix.cabal
+++ b/packages/base/hmatrix.cabal
@@ -93,7 +93,6 @@ library
     if arch(i386)
         cc-options:     -msse2
 
-    cpp-options:        -DBINARY
 
     if os(OSX)
         if flag(openblas)
diff --git a/packages/base/src/Internal/Element.hs b/packages/base/src/Internal/Element.hs
index a459678..eb3a25b 100644
--- a/packages/base/src/Internal/Element.hs
+++ b/packages/base/src/Internal/Element.hs
@@ -3,7 +3,6 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE CPP #-}
 
 -----------------------------------------------------------------------------
 -- |
@@ -35,7 +34,6 @@ import Control.Monad(liftM)
 
 -------------------------------------------------------------------
 
-#ifdef BINARY
 
 import Data.Binary
 
@@ -48,7 +46,6 @@ instance (Binary (Vector a), Element a) => Binary (Matrix a) where
           v <- get
           return (reshape c v)
 
-#endif
 
 -------------------------------------------------------------------
 
diff --git a/packages/base/src/Internal/Numeric.hs b/packages/base/src/Internal/Numeric.hs
index e8c7440..dd74165 100644
--- a/packages/base/src/Internal/Numeric.hs
+++ b/packages/base/src/Internal/Numeric.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
diff --git a/packages/base/src/Internal/Vector.hs b/packages/base/src/Internal/Vector.hs
index de4e670..b4e235c 100644
--- a/packages/base/src/Internal/Vector.hs
+++ b/packages/base/src/Internal/Vector.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE MagicHash, CPP, UnboxedTuples, BangPatterns, FlexibleContexts #-}
+{-# LANGUAGE MagicHash, UnboxedTuples, BangPatterns, FlexibleContexts #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 
 
@@ -39,12 +39,10 @@ import GHC.Base(realWorld#, IO(IO), when)
 import qualified Data.Vector.Storable as Vector
 import Data.Vector.Storable(Vector, fromList, unsafeToForeignPtr, unsafeFromForeignPtr, unsafeWith)
 
-#ifdef BINARY
 import Data.Binary
 import Control.Monad(replicateM)
 import qualified Data.ByteString.Internal as BS
 import Data.Vector.Storable.Internal(updPtr)
-#endif
 
 type I = CInt
 type Z = Int64
@@ -380,7 +378,6 @@ mapVectorWithIndex f v = unsafePerformIO $ do
 --------------------------------------------------------------------------------
 
 
-#ifdef BINARY
 
 -- a 64K cache, with a Double taking 13 bytes in Bytestring,
 -- implies a chunk size of 5041
@@ -432,7 +429,6 @@ instance (Binary a, Storable a) => Binary (Vector a) where
 
     -- get = fmap bs2v get
 
-#endif
 
 
 -------------------------------------------------------------------
-- 
cgit v1.2.3