diff options
| author | Andrey Semashev <andrey.semashev@gmail.com> | 2012-12-15 18:28:27 +0000 |
|---|---|---|
| committer | Andrey Semashev <andrey.semashev@gmail.com> | 2012-12-15 18:28:27 +0000 |
| commit | f46685dd72787b8caaf08cf461d1a77c40462fab (patch) | |
| tree | 3644fd8e4ce759de616fe7cbef2420ddb5c48d89 | |
| parent | 15a4c127d41fb3b6215c382f072a334f07aa61ec (diff) | |
| download | boost-f46685dd72787b8caaf08cf461d1a77c40462fab.tar.gz | |
Boost.Atomic and Boost.Lockfree merged from trunk.
[SVN r81976]
| -rw-r--r-- | .gitmodules | 8 | ||||
| -rw-r--r-- | doc/Jamfile.v2 | 5 | ||||
| -rw-r--r-- | doc/html/atomic.html | 16 | ||||
| -rw-r--r-- | doc/html/lockfree.html | 16 | ||||
| -rw-r--r-- | doc/src/boost.xml | 4 | ||||
| m--------- | libs/atomic | 0 | ||||
| -rw-r--r-- | libs/libraries.htm | 4 | ||||
| m--------- | libs/lockfree | 0 | ||||
| -rw-r--r-- | libs/maintainers.txt | 2 | ||||
| -rw-r--r-- | status/Jamfile.v2 | 2 |
10 files changed, 57 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index fb3d108dc7..3e74f67b44 100644 --- a/.gitmodules +++ b/.gitmodules @@ -354,6 +354,10 @@ path = libs/accumulators url = ../accumulators.git fetchRecurseSubmodules = on-demand +[submodule "atomic"] + path = libs/atomic + url = ../atomic.git + fetchRecurseSubmodules = on-demand [submodule "scope_exit"] path = libs/scope_exit url = ../scope_exit.git @@ -430,3 +434,7 @@ path = libs/multiprecision url = ../multiprecision.git fetchRecurseSubmodules = on-demand +[submodule "lockfree"] + path = libs/lockfree + url = ../lockfree.git + fetchRecurseSubmodules = on-demand diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 12523c8abd..2d1ddc4e20 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -60,6 +60,9 @@ boostbook doc #<dependency>../libs/spirit/doc//spirit <dependency>../libs/heap/doc//autodoc.xml <dependency>../libs/heap/doc//heap + <dependency>../libs/lockfree/doc//autodoc.xml + <dependency>../libs/lockfree/doc//lockfree + <dependency>../libs/atomic/doc//atomic ## Add path references to the QuickBook generated docs... @@ -90,6 +93,8 @@ boostbook doc <implicit-dependency>../libs/random/doc//random #<implicit-dependency>../libs/spirit/doc//spirit <implicit-dependency>../libs/heap/doc//heap + <implicit-dependency>../libs/lockfree/doc//lockfree + <implicit-dependency>../libs/atomic/doc//atomic <xsl:param>boost.libraries=../../libs/libraries.htm diff --git a/doc/html/atomic.html b/doc/html/atomic.html new file mode 100644 index 0000000000..24ea8a8e42 --- /dev/null +++ b/doc/html/atomic.html @@ -0,0 +1,16 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> + <head> + <!-- Copyright (C) 2002 Douglas Gregor <doug.gregor -at- gmail.com> + + Distributed under the Boost Software License, Version 1.0. + (See accompanying file LICENSE_1_0.txt or copy at + http://www.boost.org/LICENSE_1_0.txt) --> + <title>Redirect to generated documentation</title> + <meta http-equiv="refresh" content="0; URL=http://boost-sandbox.sourceforge.net/doc/html/atomic.html"> + </head> + <body> + Automatic redirection failed, please go to + <a href="http://boost-sandbox.sourceforge.net/doc/html/atomic.html">http://boost-sandbox.sourceforge.net/doc/html/atomic.html</a> + </body> +</html> diff --git a/doc/html/lockfree.html b/doc/html/lockfree.html new file mode 100644 index 0000000000..a64364f8dc --- /dev/null +++ b/doc/html/lockfree.html @@ -0,0 +1,16 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> + <head> + <!-- Copyright (C) 2002 Douglas Gregor <doug.gregor -at- gmail.com> + + Distributed under the Boost Software License, Version 1.0. + (See accompanying file LICENSE_1_0.txt or copy at + http://www.boost.org/LICENSE_1_0.txt) --> + <title>Redirect to generated documentation</title> + <meta http-equiv="refresh" content="0; URL=http://boost-sandbox.sourceforge.net/doc/html/lockfree.html"> + </head> + <body> + Automatic redirection failed, please go to + <a href="http://boost-sandbox.sourceforge.net/doc/html/lockfree.html">http://boost-sandbox.sourceforge.net/doc/html/lockfree.html</a> + </body> +</html> diff --git a/doc/src/boost.xml b/doc/src/boost.xml index b2e40c5d4e..07f4e76470 100644 --- a/doc/src/boost.xml +++ b/doc/src/boost.xml @@ -55,6 +55,8 @@ </libraryinfo> </library> + <xi:include href="atomic.xml"/> + <library name="Bind" dirname="bind" html-only="1"> <libraryinfo> <author> @@ -372,6 +374,8 @@ <xi:include href="lexical_cast.xml"/> + <xi:include href="lockfree.xml"/> + <library name="Math" dirname="math" html-only="1"> <libraryinfo> <author> diff --git a/libs/atomic b/libs/atomic new file mode 160000 +Subproject b5da965c5bdc04eda2e0929d198e0ea02e7327e diff --git a/libs/libraries.htm b/libs/libraries.htm index a46fad9b3e..11e8f27bf7 100644 --- a/libs/libraries.htm +++ b/libs/libraries.htm @@ -94,6 +94,7 @@ how to download, build, and install the libraries.</p> with constant or generated data has never been easier, from Thorsten Ottosen. </li> + <li><a href="atomic/index.html">atomic</a> - C++11-style atomic<>, from Helge Bahmann, maintained by Tim Blechmann</li> <li><a href="bimap/index.html">bimap</a> - Bidirectional maps, from Matias Capeletto. </li> <li><a href="bind/bind.html">bind</a> and <a href="bind/mem_fn.html"> mem_fn</a> - Generalized binders for function/object/pointers and member functions, from Peter @@ -194,6 +195,7 @@ how to download, build, and install the libraries.</p> handling tools for C++, from Artyom Beilis</li> <li><a href="conversion/lexical_cast.htm">lexical_cast</a> - General literal text conversions, such as an <code>int</code> represented as a <code>string</code>, or vice-versa, from Kevlin Henney.</li> + <li><a href="lockfree/index.html">lockfree</a> - Lockfree data structures, from Tim Blechmann</li> <li><a href="math/doc/index.html">math</a> - Several contributions in the domain of mathematics, from various authors.</li> <li><a href="math/doc/complex/html/index.html">math/complex number algorithms</a> - @@ -400,10 +402,12 @@ how to download, build, and install the libraries.</p> <li><a href="asio/index.html">asio</a> - Portable networking and other low-level I/O, including sockets, timers, hostname resolution, socket iostreams, serial ports, file descriptors and Windows HANDLEs, from Chris Kohlhoff.</li> + <li><a href="atomic/index.html">atomic</a> - C++11-style atomic<>, from Helge Bahmann, maintained by Tim Blechmann</li> <li><a href="context/index.html">context</a> - Context switching library, from Oliver Kowalke</li> <li><a href="coroutine/index.html">coroutine</a> - Coroutine library, from Oliver Kowalke</li> <li><a href="interprocess/index.html">interprocess</a> - Shared memory, memory mapped files, process-shared mutexes, condition variables, containers and allocators, from Ion Gaztañaga</li> + <li><a href="lockfree/index.html">lockfree</a> - Lockfree data structures, from Tim Blechmann</li> <li><a href="../doc/html/mpi.html">MPI</a> - Message Passing Interface library, for use in distributed-memory parallel application programming, from Douglas Gregor and Matthias Troyer.</li> <li><a href="thread/doc/index.html">thread</a> - Portable C++ multi-threading, from William Kempf.</li> diff --git a/libs/lockfree b/libs/lockfree new file mode 160000 +Subproject 4eb962f02530cd2ceca05cf9d3194694395c430 diff --git a/libs/maintainers.txt b/libs/maintainers.txt index 052c8adff1..6abba419dd 100644 --- a/libs/maintainers.txt +++ b/libs/maintainers.txt @@ -16,6 +16,7 @@ any Alexander Nasonov <alexander.nasonov -at- gmail.com> array Marshall Clow <marshall -at- idio.com> asio Chris Kohlhoff <chris -at- kohlhoff.com> assign Thorsten Ottosen <nesotto -at- cs.auc.dk> +atomic Helge Bahmann <hcb -at- chaoticmind.net>, Tim Blechmann <tim -at- klingt.org> bimap Matias Capeletto <matias.capeletto -at- gmail.com> bind Peter Dimov <pdimov -at- mmltd.net> chrono Vicente J. Botet Escriba <vicente.botet -at- wanadoo.fr> @@ -59,6 +60,7 @@ lambda Jaakko Jarvi <jarvi -at- cs.tamu.edu> local_function Lorenzo Caminiti <lorcaminiti -at- gmail.com> locale Artyom Beilis <artyomtnk -at- yahoo.com> logic Douglas Gregor <dgregor -at- cs.indiana.edu> +lockfree Tim Blechmann <tim -at- klingt.org> math Hubert Holin <Hubert.Holin -at- meteo.fr>, John Maddock <john -at- johnmaddock.co.uk> move Ion Gaztanaga <igaztanaga -at- gmail.com> mpl Aleksey Gurtovoy <agurtovoy -at- meta-comm.com> diff --git a/status/Jamfile.v2 b/status/Jamfile.v2 index 88770234d1..a98d067155 100644 --- a/status/Jamfile.v2 +++ b/status/Jamfile.v2 @@ -53,6 +53,7 @@ run-tests libs : array/test # test-suite array asio/test # test-suite asio assign/test # test-suite assign + atomic/test # test-suite atomic any/test # test-suite any bimap/test # test-suite bimap bind/test # test-suite bind @@ -101,6 +102,7 @@ run-tests libs : local_function/test # test-suite local_function locale/test # test-suite locale logic/test # test-suite logic + lockfree/test # test-suite lockfree math/test # test-suite math multiprecision/test # test-suite multiprecision move/example # test-suite move_example |