merge boost.heap

[SVN r76023]
HHHHHCS · Dec 17, 2011 · 2bfb3de · 2bfb3de
1 parent 46b1725
commit 2bfb3de
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -378,6 +378,10 @@
 	path = libs/msm
 	url = ../msm.git
 	fetchRecurseSubmodules = on-demand
+[submodule "heap"]
+	path = libs/heap
+	url = ../heap.git
+	fetchRecurseSubmodules = on-demand
 [submodule "ratio"]
 	path = libs/ratio
 	url = ../ratio.git

diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
@@ -58,6 +58,8 @@ boostbook doc
     <dependency>../libs/signals2/doc//hello_world_def_code_snippet.xml
     <dependency>../libs/random/doc//random
     #<dependency>../libs/spirit/doc//spirit
+    <dependency>../libs/heap/doc//autodoc.xml
+    <dependency>../libs/heap/doc//heap
 
     ## Add path references to the QuickBook generated docs...
 
@@ -87,6 +89,7 @@ boostbook doc
     <implicit-dependency>../libs/signals2/doc//hello_world_def_code_snippet.xml
     <implicit-dependency>../libs/random/doc//random
     #<implicit-dependency>../libs/spirit/doc//spirit
+    <implicit-dependency>../libs/heap/doc//heap
 
     <xsl:param>boost.libraries=../../libs/libraries.htm
 

diff --git a/doc/src/boost.xml b/doc/src/boost.xml
@@ -295,6 +295,8 @@
      </libraryinfo>
    </library>
 
+   <xi:include href="heap.xml"/>
+
    <library name="Integer" dirname="integer" html-only="1"
             url="../../libs/integer/index.html">
      <libraryinfo>

diff --git a/libs/heap b/libs/heap
diff --git a/status/Jamfile.v2 b/status/Jamfile.v2
@@ -83,6 +83,7 @@ run-tests libs :
     gil/test                    # test-suite gil
     graph/test                  # test-suite graph
     graph_parallel/test         # test-suite graph/parallel
+    heap/test                   # test-suite heap
     icl/test                    # test-suite icl
     io/test                     # test-suite io
     integer/test                # test-suite integer