[commit: packages/containers] changelog-foldtree, cleaned_bugfix394, master, merge-doc-target, merge-fixes-5.9, merge-restrict-fix-5.8, revert-184-generic, revert-408-bugfix_394: Nuke include/Typeable.h, create include/containers.h instead. (b3257c8)

[git at git.haskell.org]

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

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

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

commit b3257c8b59a9f4dec03be19b6d2cd7a562691e04
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 23:48:18 2014 +0100

    Nuke include/Typeable.h, create include/containers.h instead.
    
    The "Typeable.h" collides with the header of same name in base.
    
    The new "containers.h" is now used in every Haskell source.
    It contains more stuff used across the containers codebase:
    - INSTANCE_TYPEABLE[0-2] (was in Typeable.h)
    - include MachDeps on __GLASGOW_HASKELL__ to define WORD_SIZE_IN_BITS
    - define STRICT_x_OF_y macros
    - define MIN_VERSION_base if not defined by cabal (during cabal-less build)


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

b3257c8b59a9f4dec03be19b6d2cd7a562691e04
 Data/Graph.hs            |  3 +++
 Data/IntMap.hs           |  3 +++
 Data/IntMap/Base.hs      | 15 ++---------
 Data/IntMap/Lazy.hs      |  3 +++
 Data/IntMap/Strict.hs    |  3 +++
 Data/IntSet.hs           |  3 +++
 Data/IntSet/Base.hs      | 25 +++----------------
 Data/Map.hs              |  3 +++
 Data/Map/Base.hs         | 20 +++------------
 Data/Map/Lazy.hs         |  3 +++
 Data/Map/Strict.hs       | 23 ++++-------------
 Data/Sequence.hs         | 18 +++-----------
 Data/Set.hs              |  3 +++
 Data/Set/Base.hs         | 19 +++-----------
 Data/Tree.hs             |  9 ++-----
 Data/Utils/BitUtil.hs    |  8 +++---
 Data/Utils/StrictFold.hs |  3 +++
 Data/Utils/StrictPair.hs |  3 +++
 containers.cabal         |  2 +-
 include/Typeable.h       | 65 ------------------------------------------------
 include/containers.h     | 61 +++++++++++++++++++++++++++++++++++++++++++++
 21 files changed, 116 insertions(+), 179 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b3257c8b59a9f4dec03be19b6d2cd7a562691e04