summaryrefslogtreecommitdiff
path: root/src/couch
diff options
context:
space:
mode:
authorJay Doane <jay.s.doane@gmail.com>2018-12-28 10:18:06 -0800
committerJay Doane <jay.s.doane@gmail.com>2018-12-28 10:18:06 -0800
commit21359d2034daa348b9520f8e49f6fa1806eebd92 (patch)
tree3e2874828eecec40976273bade07dc00968c5765 /src/couch
parentc347470851e1cd62f5c304f15ef9d5ee1b34d1b4 (diff)
downloadcouchdb-21359d2034daa348b9520f8e49f6fa1806eebd92.tar.gz
Change minimum supported Erlang version to OTP 19
Diffstat (limited to 'src/couch')
-rw-r--r--src/couch/rebar.config.script4
-rw-r--r--src/couch/src/couch_rand.erl30
-rw-r--r--src/couch/src/couch_util.erl9
3 files changed, 0 insertions, 43 deletions
diff --git a/src/couch/rebar.config.script b/src/couch/rebar.config.script
index 5321cff66..846e8b469 100644
--- a/src/couch/rebar.config.script
+++ b/src/couch/rebar.config.script
@@ -146,10 +146,6 @@ PortSpecs = case os:type() of
BaseSpecs
end,
PlatformDefines = [
- {platform_define, "^R16", 'PRE18TIMEFEATURES'},
- {platform_define, "^17", 'PRE18TIMEFEATURES'},
- {platform_define, "^R16", 'NORANDMODULE'},
- {platform_define, "^17", 'NORANDMODULE'},
{platform_define, "win32", 'WINDOWS'}
],
AddConfig = [
diff --git a/src/couch/src/couch_rand.erl b/src/couch/src/couch_rand.erl
index f5a8fc6af..67454b8ad 100644
--- a/src/couch/src/couch_rand.erl
+++ b/src/couch/src/couch_rand.erl
@@ -19,39 +19,9 @@
]).
--ifdef(NORANDMODULE).
-
-
-uniform() ->
- maybe_set_random_seed(),
- random:uniform().
-
-
-uniform(N) ->
- maybe_set_random_seed(),
- random:uniform(N).
-
-
-maybe_set_random_seed() ->
- case get(random_seed) of
- undefined ->
- {_, Sec, USec} = os:timestamp(),
- Seed = {erlang:phash2(self()), Sec, USec},
- random:seed(Seed);
- _ ->
- ok
- end.
-
-
--else.
-
-
uniform() ->
rand:uniform().
uniform(N) ->
rand:uniform(N).
-
-
--endif.
diff --git a/src/couch/src/couch_util.erl b/src/couch/src/couch_util.erl
index ddd24aab0..62e17ce36 100644
--- a/src/couch/src/couch_util.erl
+++ b/src/couch/src/couch_util.erl
@@ -737,18 +737,9 @@ process_dict_get(Pid, Key, DefaultValue) ->
end.
--ifdef(PRE18TIMEFEATURES).
-
-unique_monotonic_integer() ->
- {Ms, S, Us} = erlang:now(),
- (Ms * 1000000 + S) * 1000000 + Us.
-
--else.
-
unique_monotonic_integer() ->
erlang:unique_integer([monotonic, positive]).
--endif.
check_config_blacklist(Section) ->
case lists:member(Section, ?BLACKLIST_CONFIG_SECTIONS) of