2
0
mirror of https://github.com/boostorg/fiber.git synced 2026-02-18 14:02:18 +00:00

Merge pull request #12 from mlang/master

Fixes some typos found during review.
This commit is contained in:
olk
2013-12-29 05:24:29 -08:00
6 changed files with 16 additions and 16 deletions

View File

@@ -13,4 +13,4 @@ run (context switching).
A context switch between threads costs usally thousends of CPU cycles on x86 compared to a fiber switch
with less than 100 cycles. A fiber can only run on a single thread at any point in time.
Buiding: Detailed instructions can be found at https://svn.boost.org/trac/boost/wiki/TryModBoost.
Building: Detailed instructions can be found at https://svn.boost.org/trac/boost/wiki/TryModBoost.

View File

@@ -7,7 +7,7 @@
[section:attributes Attributes]
Class `attributes` is used to transfers parameters required to setup a
Class `attributes` is used to transfer parameters required to setup a
fibers's context.
struct attributes
@@ -56,7 +56,7 @@ and FPU registers are preserved.]]
[heading `attributes( flag_fpu_t preserve_fpu)`]
[variablelist
[[Effects:] [Argument `preserve_fpu` determines if FPU register have to be
[[Effects:] [Argument `preserve_fpu` determines if FPU registers have to be
preserved if a `context` switches. The default stacksize is used for the
inner `context` and the stack will be unwound after termination.]]
[[Throws:] [Nothing.]]

View File

@@ -28,7 +28,7 @@ Timed wait-operations (__wait_for__ and __wait_until__) return the state of the
[heading `timeout`]
[variablelist
[[Effects:] [The shared state did not become ready before timout has passed.]]
[[Effects:] [The shared state did not become ready before timeout has passed.]]
]
[heading `deferred`]
@@ -158,7 +158,7 @@ After construction is `false == other.valid()`]]
[variablelist
[[Effects:] [Move the state to a __shared_future__.]]
[[Throws:] [__future_error__ with error condtion __no_state__.]]
[[Throws:] [__future_error__ with error condition __no_state__.]]
]
[member_heading future..get]
@@ -169,7 +169,7 @@ After construction is `false == other.valid()`]]
[[Precondition:] [`true == valid()`]]
[[Effects:] [Returns the result.]]
[[Postcondition:] [`false == valid()`]]
[[Throws:] [__future_error__ with error condtion __no_state__.]]
[[Throws:] [__future_error__ with error condition __no_state__.]]
]
[member_heading future..wait]
@@ -178,7 +178,7 @@ After construction is `false == other.valid()`]]
[variablelist
[[Effects:] [Waits for the result will become available.]]
[[Throws:] [__future_error__ with error condtion __no_state__.]]
[[Throws:] [__future_error__ with error condition __no_state__.]]
]
[template_member_heading future..wait_for]
@@ -189,7 +189,7 @@ After construction is `false == other.valid()`]]
[variablelist
[[Effects:] [Waits for the result will become available or `timeout_duration` has passed.]]
[[Result:] [A `future_status` is returned indicating the reason for returning.]]
[[Throws:] [__future_error__ with error condtion __no_state__.]]
[[Throws:] [__future_error__ with error condition __no_state__.]]
]
[member_heading future..wait_until]
@@ -199,7 +199,7 @@ After construction is `false == other.valid()`]]
[variablelist
[[Effects:] [Waits for the result will become available or `timeout_time` has passed.]]
[[Result:] [A `future_status` is returned indicating the reason for returning.]]
[[Throws:] [__future_error__ with error condtion __no_state__.]]
[[Throws:] [__future_error__ with error condition __no_state__.]]
]
@@ -345,7 +345,7 @@ return * this;
[[Precondition:] [`true == valid()`]]
[[Effects:] [Returns the result.]]
[[Postcondition:] [`false == valid()`]]
[[Throws:] [__future_error__ with error condtion __no_state__.]]
[[Throws:] [__future_error__ with error condition __no_state__.]]
]
[member_heading shared_future..wait]
@@ -354,7 +354,7 @@ return * this;
[variablelist
[[Effects:] [Waits for the result will become available.]]
[[Throws:] [__future_error__ with error condtion __no_state__.]]
[[Throws:] [__future_error__ with error condition __no_state__.]]
]
[template_member_heading shared_future..wait_for]
@@ -365,7 +365,7 @@ return * this;
[variablelist
[[Effects:] [Waits for the result will become available or `timeout_duration` has passed.]]
[[Result:] [A `future_status` is returned indicating the reason for returning.]]
[[Throws:] [__future_error__ with error condtion __no_state__.]]
[[Throws:] [__future_error__ with error condition __no_state__.]]
]
[member_heading shared_future..wait_until]
@@ -375,7 +375,7 @@ return * this;
[variablelist
[[Effects:] [Waits for the result will become available or `timeout_time` has passed.]]
[[Result:] [A `future_status` is returned indicating the reason for returning.]]
[[Throws:] [__future_error__ with error condtion __no_state__.]]
[[Throws:] [__future_error__ with error condition __no_state__.]]
]
[endsect]

View File

@@ -87,7 +87,7 @@ private:
if ( channels_.end() == channels_.find( channel) )
throw std::runtime_error("channel does not exist");
channels_.find( channel)->second->subscribe( s);
std::cout << "new subscribtion to channel '" << channel << "'" << std::endl;
std::cout << "new subscription to channel '" << channel << "'" << std::endl;
}
void unsubscribe_( std::string const& channel, boost::shared_ptr< subscriber_session > s)

View File

@@ -26,7 +26,7 @@ int main(int argc, char* argv[])
{
if (argc != 3)
{
std::cerr << "Usage: subscriper <host> <channel>\n";
std::cerr << "Usage: subscriber <host> <channel>\n";
return 1;
}

View File

@@ -151,7 +151,7 @@ typedef basic_yield_context<
* This function is used to launch a new fiber.
*
* @param handler A handler to be called when the fiber exits. More
* importantly, the handler provides an execution context (via the the handler
* importantly, the handler provides an execution context (via the handler
* invocation hook) for the fiber. The handler must have the signature:
* @code void handler(); @endcode
*