Skip to content

Commit 46eb606

Browse files
committed
Merge remote-tracking branch 'origin/darcs' into unify
Not much here, after the config removals Conflicts: Foreign/Matlab/Engine.hsc Foreign/Matlab/Runtime.hsc Foreign/Matlab/Runtime/Generic.hs configure.ac matlab.buildinfo.in matlab.cabal
2 parents a3832ea + e0f68c3 commit 46eb606

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

Foreign/Matlab/Internal.hsc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module Foreign.Matlab.Internal (
2323
MNull, mNullArray, isMNull,
2424
MCell(..),
2525
MStruct(..),
26-
MFun,
26+
MXFun, MFun,
2727
MWSize, MWIndex, MWSignedIndex
2828
) where
2929

Foreign/Matlab/Runtime.hsc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import System.FilePath (splitFileName, dropExtensions, extSeparator
2828
, (<.>), (</>))
2929
import Foreign.Matlab.Util
3030
import Foreign.Matlab.Internal
31-
3231
import System.IO.Unsafe (unsafePerformIO)
3332

3433
#include "hsc_sym.h"

Foreign/Matlab/Runtime/Generic.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ mlGenericSetVar :: MLGeneric -> String -> MXArray a -> IO ()
6060
mlGenericSetVar mlg v x = do
6161
b <- createRowVector "base"
6262
v <- createRowVector v
63-
_ <- mlGenericFun mlg "assignin" [anyMXArray b,anyMXArray v,anyMXArray x] 0
63+
[] <- mlGenericFun mlg "assignin" [anyMXArray b,anyMXArray v,anyMXArray x] 0
6464
freeMXArray v
6565
freeMXArray b
6666

0 commit comments

Comments
 (0)