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 /doc | |
| parent | 15a4c127d41fb3b6215c382f072a334f07aa61ec (diff) | |
| download | boost-f46685dd72787b8caaf08cf461d1a77c40462fab.tar.gz | |
Boost.Atomic and Boost.Lockfree merged from trunk.
[SVN r81976]
Diffstat (limited to 'doc')
| -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 |
4 files changed, 41 insertions, 0 deletions
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> |