瀏覽代碼

Merged upstream changes

Antony Polukhin 10 年之前
父節點
當前提交
eca5792b44
共有 12 個文件被更改,包括 24 次插入6 次删除
  1. 7 0
      .gitmodules
  2. 1 1
      libs/align
  3. 1 1
      libs/any
  4. 1 0
      libs/compute
  5. 1 1
      libs/conversion
  6. 1 0
      libs/hana
  7. 6 0
      libs/libraries.htm
  8. 2 0
      libs/maintainers.txt
  9. 1 1
      libs/range
  10. 1 1
      libs/utility
  11. 1 1
      libs/variant
  12. 1 0
      status/Jamfile.v2

+ 7 - 0
.gitmodules

@@ -505,3 +505,10 @@
 [submodule "dll"]
 	path = libs/dll
 	url = ../dll.git
+[submodule "compute"]
+	path = libs/compute
+	url = ../compute.git
+	fetchRecurseSubmodules = on-demand
+[submodule "libs/hana"]
+	path = libs/hana
+	url = ../hana.git

+ 1 - 1
libs/align

@@ -1 +1 @@
-Subproject commit 48b3792fa1da7d2fc95a38227b583381b687d5e3
+Subproject commit 1f829685e08d4c6b8c96e08b043bf8e03d27ae49

+ 1 - 1
libs/any

@@ -1 +1 @@
-Subproject commit ed7cac4ee207b125aa25144f2674f9550def2232
+Subproject commit 3b7c34998d7364aa312a46f6578622ae79d0378f

+ 1 - 0
libs/compute

@@ -0,0 +1 @@
+Subproject commit c75f5dc858ae4368f71ade0a1defaae7b3e3f204

+ 1 - 1
libs/conversion

@@ -1 +1 @@
-Subproject commit 58e8e7889979054c50ccd44baae6683f2a931205
+Subproject commit da8b2fe695cffda506059b49a4782ede01fba10f

+ 1 - 0
libs/hana

@@ -0,0 +1 @@
+Subproject commit 039cc425e615a8f715a52267a58a602ab9c52bb6

+ 6 - 0
libs/libraries.htm

@@ -175,6 +175,9 @@ how to download, build, and install the libraries.</p>
     <li><a href="graph/doc/table_of_contents.html">graph</a> -
         Generic graph components and algorithms, from Jeremy Siek
         and a University of Notre Dame team; now maintained by Andrew Sutton and Jeremiah Willcock.</li>
+    <li><a href="hana/doc/html/index.html">hana</a> (C++14) - Heterogeneous sequences
+    and algorithms, type-level computations and other metaprogramming tools,
+    from Louis Dionne</li>
     <li><a href="heap/index.html">heap</a> -
         Priority queue data structures, from Tim Blechmann</li>
     <li><a href="icl/index.html">icl</a> -
@@ -788,6 +791,9 @@ of arbitrary data for persistence and marshalling, from Robert Ramey</li>
     <li><a href="fusion/index.html">fusion</a> -
         Library for working with tuples, including various containers,
     algorithms, etc. From Joel de Guzman, Dan Marsden and Tobias Schwinger.</li>
+    <li><a href="hana/doc/html/index.html">hana</a> (C++14) - Heterogeneous sequences
+    and algorithms, type-level computations and other metaprogramming tools,
+    from Louis Dionne</li>
     <li><a href="mpl/doc/index.html">mpl</a> - Template metaprogramming
     framework of compile-time algorithms, sequences and metafunction classes,
     from Aleksey Gurtovoy.</li>

+ 2 - 0
libs/maintainers.txt

@@ -25,6 +25,7 @@ bind                  Peter Dimov <pdimov -at- pdimov.com>
 chrono                Vicente J. Botet Escriba <vicente.botet -at- wanadoo.fr>
 chrono/stopwatch      Vicente J. Botet Escriba <vicente.botet -at- wanadoo.fr>
 circular_buffer       Jan Gaspar <jano_gaspar -at- yahoo.com>
+compute               Kyle Lutz <kyle.r.lutz -at- gmail.com>
 concept_check         Jeremy Siek <jeremy.siek -at- gmail.com>
 config                John Maddock <john -at- johnmaddock.co.uk>
 container             Ion Gaztanaga <igaztanaga -at- gmail.com>
@@ -56,6 +57,7 @@ fusion                Joel de Guzman <joel -at- boost-consulting.com>, Dan Marsd
 geometry              Barend Gehrels <barend -at- xs4all.nl>, Bruno Lalande <bruno.lalande -at- gmail.com>, Mateusz Loskot <mateusz -at- loskot.net>, Adam Wulkiewicz <adam.wulkiewicz -at- gmail.com>
 gil                   Christian Henning <chhenning -at- gmail.com>
 graph                 Andrew Sutton <asutton -at- cs.kent.edu>
+hana                  Louis Dionne <ldionne.2 -at- gmail.com>
 heap                  Tim Blechmann <tim -at- klingt.org>
 icl                   Joachim Faulhaber <afojgo -at- gmail.com>
 integer               Daryle Walker <darylew -at- hotmail.com>

+ 1 - 1
libs/range

@@ -1 +1 @@
-Subproject commit 7669f5254748224ef7cdb99ccd43e63758fbd342
+Subproject commit 0e931f4a80521acb00ff76c03237b0804b2cc572

+ 1 - 1
libs/utility

@@ -1 +1 @@
-Subproject commit cf5ad341ed41e91f84579a9901a567efaa25cf48
+Subproject commit 1caa745dd72b2cffebafa904658fde0e9cac1232

+ 1 - 1
libs/variant

@@ -1 +1 @@
-Subproject commit 98072751406cd4e648db696b1ec456145330bf02
+Subproject commit d2db11c5a4bc06fcf31f9396770dd71185fd4ad1

+ 1 - 0
status/Jamfile.v2

@@ -98,6 +98,7 @@ run-tests libs :
     gil/test                    # test-suite gil
     graph/test                  # test-suite graph
     graph_parallel/test         # test-suite graph/parallel
+    hana/test                   # test-suite hana
     heap/test                   # test-suite heap
     icl/test                    # test-suite icl
     integer/test                # test-suite integer

粤ICP备19079148号