Merge with 3.2.

This commit is contained in:
Ezio Melotti 2011-10-19 11:06:26 +03:00
commit f10644983e
41 changed files with 48 additions and 48 deletions

View file

@ -886,7 +886,7 @@ As an example, here is a simple way to synchronize a client and server thread::
Pass the barrier. When all the threads party to the barrier have called
this function, they are all released simultaneously. If a *timeout* is
provided, is is used in preference to any that was supplied to the class
provided, it is used in preference to any that was supplied to the class
constructor.
The return value is an integer in the range 0 to *parties* -- 1, different