Просмотр исходного кода

Boost.Atomic and Boost.Lockfree merged from trunk.

[SVN r81976]
Andrey Semashev 13 лет назад
Родитель
Сommit
f46685dd72
10 измененных файлов с 59 добавлено и 0 удалено
  1. 8 0
      .gitmodules
  2. 5 0
      doc/Jamfile.v2
  3. 16 0
      doc/html/atomic.html
  4. 16 0
      doc/html/lockfree.html
  5. 4 0
      doc/src/boost.xml
  6. 1 0
      libs/atomic
  7. 4 0
      libs/libraries.htm
  8. 1 0
      libs/lockfree
  9. 2 0
      libs/maintainers.txt
  10. 2 0
      status/Jamfile.v2

+ 8 - 0
.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

+ 5 - 0
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
 

+ 16 - 0
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>

+ 16 - 0
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>

+ 4 - 0
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>

+ 1 - 0
libs/atomic

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

+ 4 - 0
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> -&nbsp; 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&ntilde;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>

+ 1 - 0
libs/lockfree

@@ -0,0 +1 @@
+Subproject commit 4eb962f02530cd2ceca05cf9d3194694395c4304

+ 2 - 0
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>

+ 2 - 0
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

粤ICP备19079148号