You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2017/09/28 21:02:11 UTC

[03/50] meck commit: updated refs/heads/master to 3544aca

Fix eunit compile failure on Erlang 17+ (hamcrest)


Project: http://git-wip-us.apache.org/repos/asf/couchdb-meck/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-meck/commit/8de54323
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-meck/tree/8de54323
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-meck/diff/8de54323

Branch: refs/heads/master
Commit: 8de5432311ed89e7f7fcdb99c4a577239d225cd9
Parents: 86a099f
Author: Marco Molteni <ma...@laposte.net>
Authored: Sat Apr 30 14:32:35 2016 +0200
Committer: Marco Molteni <ma...@laposte.net>
Committed: Sat Apr 30 14:46:20 2016 +0200

----------------------------------------------------------------------
 rebar.config | 3 ++-
 test.config  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-meck/blob/8de54323/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index f63df70..694cc01 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,7 +1,8 @@
 %% Compiler Options ===========================================================
 {erl_opts, [
     %% Erlang releases after 17 don't put R in front of their name, and also require dict() to be written like dict:dict()
-    {platform_define, "^R", non_namespaced_types},
+    {platform_define, "^R", non_namespaced_types},  % used by meck
+    {platform_define, "^[0-9]+", namespaced_types}, % used by hamcrest
     warn_export_all,
     warn_export_vars,
     warn_shadow_vars,

http://git-wip-us.apache.org/repos/asf/couchdb-meck/blob/8de54323/test.config
----------------------------------------------------------------------
diff --git a/test.config b/test.config
index 69ed470..ade907f 100644
--- a/test.config
+++ b/test.config
@@ -6,7 +6,8 @@
 %% Compiler Options ===========================================================
 {erl_opts, [
     %% Erlang releases after 17 don't put R in front of their name, and also require dict() to be written like dict:dict()
-    {platform_define, "^R", non_namespaced_types},
+    {platform_define, "^R", non_namespaced_types},  % used by meck
+    {platform_define, "^[0-9]+", namespaced_types}, % used by hamcrest
     {platform_define, "^R(?!16B03)", cover_empty_compile_opts},
     warnings_as_errors,
     debug_info