mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-28 22:21:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #5462 from andralex/concurrencybasesux

Browse source 
Remove std.concurrencybase
merged-on-behalf-of: Andrei Alexandrescu <andralex@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2017-06-17 06:09:08 +02:00 • committed by GitHub
commit abfffae14f
6 changed files with 7 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
index.d
View file

@ -461,7 +461,6 @@ $(COMMENT
$(TR $(TR
$(TDNW $(TDNW
$(LINK2 core_sync_config.html, core.sync.config)$(BR) $(LINK2 core_sync_config.html, core.sync.config)$(BR)
$(LINK2 std_concurrencybase.html, std.concurrencybase)$(BR)
$(LINK2 std_container_util.html, std.container.util)$(BR) $(LINK2 std_container_util.html, std.container.util)$(BR)
$(LINK2 std_regex_internal_backtracking.html, std.regex.internal.backtracking)$(BR) $(LINK2 std_regex_internal_backtracking.html, std.regex.internal.backtracking)$(BR)
$(LINK2 std_regex_internal_generator.html, std.regex.internal.generator)$(BR) $(LINK2 std_regex_internal_generator.html, std.regex.internal.generator)$(BR)

2
posix.mak
View file

@ -219,7 +219,7 @@ EXTRA_MODULES_COMMON := $(addprefix etc/c/,curl odbc/sql odbc/sqlext \
EXTRA_DOCUMENTABLES := $(EXTRA_MODULES_LINUX) $(EXTRA_MODULES_WIN32) $(EXTRA_MODULES_COMMON) EXTRA_DOCUMENTABLES := $(EXTRA_MODULES_LINUX) $(EXTRA_MODULES_WIN32) $(EXTRA_MODULES_COMMON)
EXTRA_MODULES_INTERNAL := $(addprefix std/, \ EXTRA_MODULES_INTERNAL := $(addprefix std/, \
algorithm/internal concurrencybase \ algorithm/internal \
$(addprefix internal/, \ $(addprefix internal/, \
cstring digest/sha_SSSE3 \ cstring digest/sha_SSSE3 \
$(addprefix math/, biguintcore biguintnoasm biguintx86 \ $(addprefix math/, biguintcore biguintnoasm biguintx86 \

8
std/concurrency.d
View file

@ -69,7 +69,6 @@ import core.atomic;
import core.sync.condition; import core.sync.condition;
import core.sync.mutex; import core.sync.mutex;
import core.thread; import core.thread;
import std.concurrencybase;
import std.range.primitives; import std.range.primitives;
import std.traits; import std.traits;
@ -910,12 +909,13 @@ private
{ {
__gshared Tid[string] tidByName; __gshared Tid[string] tidByName;
__gshared string[][Tid] namesByTid; __gshared string[][Tid] namesByTid;
__gshared Mutex registryLock;
} }
extern (C) void std_concurrency_static_this() private @property Mutex registryLock()
{ {
registryLock = new Mutex; __gshared Mutex impl;
initOnce!impl(new Mutex);
return impl;
} }
private void unregisterMe() private void unregisterMe()

20
std/concurrencybase.d
View file

@ -1,20 +0,0 @@
// Written in the D programming language.
/**
* The only purpose of this module is to do the static construction for
* std.concurrency, to eliminate cyclic construction errors.
*
* License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
* Source: $(PHOBOSSRC std/_concurrencybase.d)
*/
module std.concurrencybase;
import core.sync.mutex;
extern(C) void std_concurrency_static_this();
shared static this()
{
std_concurrency_static_this();
}

4
win32.mak
View file

@ -146,8 +146,7 @@ SRC_STD_3a= \
std\exception.d \ std\exception.d \
std\compiler.d \ std\compiler.d \
std\system.d \ std\system.d \
std\concurrency.d \ std\concurrency.d
std\concurrencybase.d
SRC_STD_4= \ SRC_STD_4= \
std\uuid.d std\uuid.d
@ -633,7 +632,6 @@ cov : $(SRC_TO_COMPILE) $(LIB)
$(DMD) -conf= -cov=79 -unittest -main -run std\random.d $(DMD) -conf= -cov=79 -unittest -main -run std\random.d
$(DMD) -conf= -cov=92 -unittest -main -run std\exception.d $(DMD) -conf= -cov=92 -unittest -main -run std\exception.d
$(DMD) -conf= -cov=73 -unittest -main -run std\concurrency.d $(DMD) -conf= -cov=73 -unittest -main -run std\concurrency.d
$(DMD) -conf= -cov=100 -unittest -main -run std\concurrencybase.d
$(DMD) -conf= -cov=95 -unittest -main -run std\datetime\date.d $(DMD) -conf= -cov=95 -unittest -main -run std\datetime\date.d
$(DMD) -conf= -cov=95 -unittest -main -run std\datetime\interval.d $(DMD) -conf= -cov=95 -unittest -main -run std\datetime\interval.d
$(DMD) -conf= -cov=95 -unittest -main -run std\datetime\package.d $(DMD) -conf= -cov=95 -unittest -main -run std\datetime\package.d

3
win64.mak
View file

@ -152,8 +152,7 @@ SRC_STD_3c= \
std\exception.d \ std\exception.d \
std\compiler.d \ std\compiler.d \
std\system.d \ std\system.d \
std\concurrency.d \ std\concurrency.d
std\concurrencybase.d
SRC_STD_3d= \ SRC_STD_3d= \
std\bitmanip.d \ std\bitmanip.d \