Skip to content

Commit 62c0191

Browse files
authored
Merge pull request #4508 from burner/concurrency_housekeeping
std.concurrency housekeeping
2 parents 2ccfbcc + bb119be commit 62c0191

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

std/concurrency.d

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ private
193193
}
194194
}
195195

196-
@property ref ThreadInfo thisInfo()
196+
@property ref ThreadInfo thisInfo() nothrow
197197
{
198198
if ( scheduler is null )
199199
return ThreadInfo.thisInfo;
@@ -219,7 +219,7 @@ static ~this()
219219
*/
220220
class MessageMismatch : Exception
221221
{
222-
this( string msg = "Unexpected message type" )
222+
this( string msg = "Unexpected message type" ) @safe pure
223223
{
224224
super( msg );
225225
}
@@ -232,7 +232,7 @@ class MessageMismatch : Exception
232232
*/
233233
class OwnerTerminated : Exception
234234
{
235-
this( Tid t, string msg = "Owner terminated" )
235+
this( Tid t, string msg = "Owner terminated" ) @safe pure
236236
{
237237
super( msg );
238238
tid = t;
@@ -247,7 +247,7 @@ class OwnerTerminated : Exception
247247
*/
248248
class LinkTerminated : Exception
249249
{
250-
this( Tid t, string msg = "Link terminated" )
250+
this( Tid t, string msg = "Link terminated" ) @safe pure
251251
{
252252
super( msg );
253253
tid = t;
@@ -283,7 +283,7 @@ class PriorityMessageException : Exception
283283
*/
284284
class MailboxFull : Exception
285285
{
286-
this( Tid t, string msg = "Mailbox full" )
286+
this( Tid t, string msg = "Mailbox full" ) @safe pure
287287
{
288288
super( msg );
289289
tid = t;
@@ -890,19 +890,19 @@ enum OnCrowding
890890

891891
private
892892
{
893-
bool onCrowdingBlock( Tid tid )
893+
bool onCrowdingBlock( Tid tid ) @safe pure
894894
{
895895
return true;
896896
}
897897

898898

899-
bool onCrowdingThrow( Tid tid )
899+
bool onCrowdingThrow( Tid tid ) @safe pure
900900
{
901901
throw new MailboxFull( tid );
902902
}
903903

904904

905-
bool onCrowdingIgnore( Tid tid )
905+
bool onCrowdingIgnore( Tid tid ) @safe pure
906906
{
907907
return false;
908908
}
@@ -1716,16 +1716,7 @@ void yield(T)(T value)
17161716
yield(value);
17171717
}
17181718

1719-
1720-
version (Win64)
1721-
{
1722-
// fibers are broken on Win64
1723-
}
1724-
else version (Win32)
1725-
{
1726-
// fibers are broken in Win32 under server 2012: bug 13821
1727-
}
1728-
else @system unittest
1719+
unittest
17291720
{
17301721
import core.exception;
17311722
import std.exception;

0 commit comments

Comments
 (0)