[commit: packages/containers] changelog-foldtree, cleaned_bugfix394, develop-0.6, develop-0.6-questionable, master, merge-doc-target, merge-fixes-5.9, merge-restrict-fix-5.8, revert-184-generic, revert-408-bugfix_394, zip-devel: Merge pull request #71 from treeowl/fmapcoerceintmap (bcebc7a)

[git at git.haskell.org]

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

On branches: changelog-foldtree,cleaned_bugfix394,develop-0.6,develop-0.6-questionable,master,merge-doc-target,merge-fixes-5.9,merge-restrict-fix-5.8,revert-184-generic,revert-408-bugfix_394,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/bcebc7af8d347d6229836847cd09ce6971dd6db4

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

commit bcebc7af8d347d6229836847cd09ce6971dd6db4
Merge: b2c1c79 ee3eb5f
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 21 07:56:17 2014 +0100

    Merge pull request #71 from treeowl/fmapcoerceintmap
    
    Implement map/coerce for IntMap



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

bcebc7af8d347d6229836847cd09ce6971dd6db4
 Data/IntMap/Base.hs                                | 23 +++++++++++++++-------
 Data/IntMap/Strict.hs                              | 12 ++++++++---
 tests-ghc/all.T                                    |  2 ++
 tests-ghc/{mapcoercemap.hs => mapcoerceintmap.hs}  |  8 ++++----
 ...{mapcoercemap.stdout => mapcoerceintmap.stdout} |  0
 .../{mapcoercemap.hs => mapcoerceintmapstrict.hs}  | 14 ++++++-------
 ...emap.stdout => mapcoerceintmapstrict.hs.stdout} |  0
 7 files changed, 38 insertions(+), 21 deletions(-)