Browse Source

Merge.

[SVN r43063]
Daniel James 18 years ago
parent
commit
c45a487b67
26 changed files with 36 additions and 25 deletions
  1. 1 1
      Jamroot
  2. 1 1
      libs/accumulators
  3. 1 1
      libs/asio
  4. 1 1
      libs/circular_buffer
  5. 1 1
      libs/function_types
  6. 1 1
      libs/functional
  7. 1 1
      libs/gil
  8. 1 1
      libs/graph
  9. 1 1
      libs/interprocess
  10. 1 1
      libs/intrusive
  11. 1 1
      libs/iostreams
  12. 1 1
      libs/logic
  13. 1 1
      libs/mpl
  14. 1 1
      libs/ptr_container
  15. 1 1
      libs/random
  16. 1 1
      libs/regex
  17. 1 1
      libs/spirit
  18. 1 1
      libs/statechart
  19. 1 1
      libs/test
  20. 1 1
      libs/unordered
  21. 1 1
      libs/utility
  22. 1 1
      libs/variant
  23. 1 1
      libs/wave
  24. 1 1
      libs/xpressive
  25. 11 0
      status/explicit-failures-markup.xml
  26. 1 1
      tools/build

+ 1 - 1
Jamroot

@@ -53,7 +53,7 @@
 #                               complete - Attempts to build all possible
 #                               variations.
 #
-#   --builddir=DIR          Build in this location instead of building
+#   --build-dir=DIR         Build in this location instead of building
 #                           within the distribution tree. Recommended!
 #
 #   --toolset=toolset       Indicates the toolset to build with.

+ 1 - 1
libs/accumulators

@@ -1 +1 @@
-Subproject commit f101e0060fec7042dcc0c1cd78d369337237a77c
+Subproject commit 59555d55ae23d2141fa80d4061114e376b1f6ba5

+ 1 - 1
libs/asio

@@ -1 +1 @@
-Subproject commit a362ec53bf3d643be727c5128292b9918208d343
+Subproject commit 005f824ca041bee2160ec67fc24f5c658702bc97

+ 1 - 1
libs/circular_buffer

@@ -1 +1 @@
-Subproject commit a74f2d445b7fe53fedd8d76ceabd6840cc7d440d
+Subproject commit 1280b36f7653fd52ae116499ea54f83c9958a4a3

+ 1 - 1
libs/function_types

@@ -1 +1 @@
-Subproject commit b7ed91bb52b687ce6c7f8dcfcc8b3319ee898aec
+Subproject commit 9b76e6a564d95ba1a9e2818ec88c34d1d4184658

+ 1 - 1
libs/functional

@@ -1 +1 @@
-Subproject commit b245ac731c16bb609e6b618caab1d9ec3a4ce874
+Subproject commit 9f881ea729eecb3f690829558a42c2586552e222

+ 1 - 1
libs/gil

@@ -1 +1 @@
-Subproject commit 8af02f097f78c3e0b3af85eb67525c584a9b563f
+Subproject commit 3b5b92675b3fd93c99a69e1d6fde1e3c29698944

+ 1 - 1
libs/graph

@@ -1 +1 @@
-Subproject commit e853f0786edfa6942d8c2db5a70ff2a194e18826
+Subproject commit a6dcf2c9c5e973e56b46a3841b0b82d821cc3186

+ 1 - 1
libs/interprocess

@@ -1 +1 @@
-Subproject commit e5932c0480748ab1557bd2e59020f2f751e6f720
+Subproject commit b878030b44397807ad90d1411d73c6dc9df6639d

+ 1 - 1
libs/intrusive

@@ -1 +1 @@
-Subproject commit 40ba44cf0b25da8c622c23b5f6bfb4b5dcbfc512
+Subproject commit cc1e4d1ee79e0ca4b26d78cc687cf52f066e39fd

+ 1 - 1
libs/iostreams

@@ -1 +1 @@
-Subproject commit 55817a30a938c8ecc10d5a4d9b8fe41e4082ae8d
+Subproject commit 0b1061ea14a05310c7e1ab05a2166200898f6cae

+ 1 - 1
libs/logic

@@ -1 +1 @@
-Subproject commit 7428061d66997b4a5740aa24e454390222140d0e
+Subproject commit 2dddc5c911ee9637d813d28e85dbd321d85601e9

+ 1 - 1
libs/mpl

@@ -1 +1 @@
-Subproject commit 4092c55714ffea0994e27a36f3d0c6581c37ccc7
+Subproject commit 861b812df64c462155160734bd3d13b81c7cb124

+ 1 - 1
libs/ptr_container

@@ -1 +1 @@
-Subproject commit fd147019d0e77631287ce3f80ec3d9505909cb81
+Subproject commit b7afb6e3f6712738b8ea7d80a25b4dad5ce5449e

+ 1 - 1
libs/random

@@ -1 +1 @@
-Subproject commit 5fe2eee51b3831de81ea8dc9e8ca72c53471d205
+Subproject commit db9f81f3a0e609f2f30fe8579314dfd9670dfef4

+ 1 - 1
libs/regex

@@ -1 +1 @@
-Subproject commit e2725d566fd8259b4ccc215c53390f114dfd595a
+Subproject commit eed156bd78157d43c49d7b889d30c4afb6772e2d

+ 1 - 1
libs/spirit

@@ -1 +1 @@
-Subproject commit 2a5bbd545bc8ecca6514aff76392c206315b8df0
+Subproject commit be2526fbdeba0613b84f981bb6027e6e34fa2928

+ 1 - 1
libs/statechart

@@ -1 +1 @@
-Subproject commit 591911d501ae9b1fcad23a00da6b9d8d7fc9940a
+Subproject commit e5bde49a2c18d51042a33329ffc26c500860cd7f

+ 1 - 1
libs/test

@@ -1 +1 @@
-Subproject commit 00af364c397b9dbc22b107e0f88f697a37eeca97
+Subproject commit bb254b9d7ecec3d51a0d88a94902ee0d87474968

+ 1 - 1
libs/unordered

@@ -1 +1 @@
-Subproject commit 9f517b95c73d0790f82c3a9c2f74312602539e4d
+Subproject commit 92ab111bb9f507129edfc940a9ace5675115f005

+ 1 - 1
libs/utility

@@ -1 +1 @@
-Subproject commit 928091779dca6c7cce5d79c135f4179abf602fb0
+Subproject commit bb3fffd9296f18a7b645103d09e94445f06fd7f9

+ 1 - 1
libs/variant

@@ -1 +1 @@
-Subproject commit 55b4edfa113277c887dd7fef6a9f4b6092ae6481
+Subproject commit a5ecd79c6e6ad451e04481552d11ea46d37953d2

+ 1 - 1
libs/wave

@@ -1 +1 @@
-Subproject commit 74935b245775ed74bdbc6597711cd28833bbb050
+Subproject commit ad1fd61e13fd1c9e7ff71e9a44a3a8d196046f2e

+ 1 - 1
libs/xpressive

@@ -1 +1 @@
-Subproject commit cbacaa8bd1a441349133ff4107914cb9e119a124
+Subproject commit 4709bbf73feac4af6f4bb631bffd7752c18a22ff

+ 11 - 0
status/explicit-failures-markup.xml

@@ -158,6 +158,16 @@
             Boost.System library on which Boost.Asio depends.
         </note>
       </mark-unusable>
+      <mark-expected-failures>
+        <test name="read_until"/>
+        <test name="read_until_select"/>
+        <toolset name="gcc-4.2.1_hpux_ia64"/>
+        <note author="Boris Gubenko">
+            On HP-UX 11.23 platform, these tests must be compiled with
+            _XOPEN_SOURCE_EXTENDED macro defined. It is likely related
+            to CR JAGag28813.
+        </note>
+        </mark-expected-failures>
     </library>
 
     <!-- assign -->
@@ -1794,6 +1804,7 @@
             <toolset name="gcc-3.1*"/>
             <toolset name="gcc-3.2*"/>
             <toolset name="gcc-3.3*"/>
+            <toolset name="gcc-4.2.1_hpux_ia64"/>
             <toolset name="mipspro"/>
             <toolset name="acc*"/>
             <toolset name="msvc-8.0~wm5*"/>

+ 1 - 1
tools/build

@@ -1 +1 @@
-Subproject commit d1a8715d6c14facaaa6aaf5c4f7ce2735d5d0cb8
+Subproject commit c2c0453b75038439e993159af0be2634fd7fdaee

粤ICP备19079148号