diff options
author | Paul J. Davis <paul.joseph.davis@gmail.com> | 2018-06-21 17:16:33 -0500 |
---|---|---|
committer | Nick Vatamaniuc <nickva@users.noreply.github.com> | 2018-10-04 12:30:48 -0400 |
commit | 4d3dfc6c0aad1f8786d89616b961a51afec2cd6e (patch) | |
tree | b0c9390a20a1fba48ce0e54c4f7eb50ed05db6d7 | |
parent | 5ee80858da68566a6007b5eb4682963534aa5185 (diff) | |
download | couchdb-4d3dfc6c0aad1f8786d89616b961a51afec2cd6e.tar.gz |
Enable parameterized module calls
This is a temporary bandaid to allow us to continue using parameterized
modules with Erlang 21. We'll have to go back and modify every one of
these files to avoid that as well as figuring out how to upgrade
mochiweb to something that doesn't use parameterized modules by the time
they are fully removed from Erlang.
Fixes #1396
-rw-r--r-- | src/chttpd/src/chttpd.erl | 3 | ||||
-rw-r--r-- | src/chttpd/src/chttpd_db.erl | 3 | ||||
-rw-r--r-- | src/chttpd/src/chttpd_external.erl | 2 | ||||
-rw-r--r-- | src/chttpd/src/chttpd_prefer_header.erl | 1 | ||||
-rw-r--r-- | src/chttpd/src/chttpd_rewrite.erl | 3 | ||||
-rw-r--r-- | src/chttpd/test/chttpd_prefer_header_test.erl | 3 | ||||
-rw-r--r-- | src/couch/src/couch_httpd.erl | 3 | ||||
-rw-r--r-- | src/couch/src/couch_httpd_auth.erl | 3 | ||||
-rw-r--r-- | src/couch/src/couch_httpd_db.erl | 3 | ||||
-rw-r--r-- | src/couch/src/couch_httpd_external.erl | 2 | ||||
-rw-r--r-- | src/couch/src/couch_httpd_proxy.erl | 2 | ||||
-rw-r--r-- | src/couch/src/couch_httpd_rewrite.erl | 3 | ||||
-rw-r--r-- | src/couch/src/couch_httpd_vhost.erl | 2 | ||||
-rw-r--r-- | src/couch/test/couchdb_http_proxy_tests.erl | 2 | ||||
-rw-r--r-- | src/couch/test/test_web.erl | 2 | ||||
-rw-r--r-- | src/couch_index/src/couch_index.erl | 2 | ||||
-rw-r--r-- | src/fabric/src/fabric_doc_attachments.erl | 2 | ||||
-rw-r--r-- | src/fabric/src/fabric_doc_atts.erl | 2 |
18 files changed, 43 insertions, 0 deletions
diff --git a/src/chttpd/src/chttpd.erl b/src/chttpd/src/chttpd.erl index a5628396b..b606ad414 100644 --- a/src/chttpd/src/chttpd.erl +++ b/src/chttpd/src/chttpd.erl @@ -11,6 +11,9 @@ % the License. -module(chttpd). + +-compile(tuple_calls). + -include_lib("couch/include/couch_db.hrl"). -include_lib("chttpd/include/chttpd.hrl"). diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl index 49d7b5849..9cde6d907 100644 --- a/src/chttpd/src/chttpd_db.erl +++ b/src/chttpd/src/chttpd_db.erl @@ -11,6 +11,9 @@ % the License. -module(chttpd_db). + +-compile(tuple_calls). + -include_lib("couch/include/couch_db.hrl"). -include_lib("couch_mrview/include/couch_mrview.hrl"). diff --git a/src/chttpd/src/chttpd_external.erl b/src/chttpd/src/chttpd_external.erl index 64664b98e..fa35c6ba2 100644 --- a/src/chttpd/src/chttpd_external.erl +++ b/src/chttpd/src/chttpd_external.erl @@ -12,6 +12,8 @@ -module(chttpd_external). +-compile(tuple_calls). + -export([handle_external_req/2, handle_external_req/3]). -export([send_external_response/2]). -export([json_req_obj_fields/0, json_req_obj/2, json_req_obj/3, json_req_obj/4]). diff --git a/src/chttpd/src/chttpd_prefer_header.erl b/src/chttpd/src/chttpd_prefer_header.erl index f550e80e5..1ad1443ea 100644 --- a/src/chttpd/src/chttpd_prefer_header.erl +++ b/src/chttpd/src/chttpd_prefer_header.erl @@ -12,6 +12,7 @@ -module(chttpd_prefer_header). +-compile(tuple_calls). -export([ maybe_return_minimal/2 diff --git a/src/chttpd/src/chttpd_rewrite.erl b/src/chttpd/src/chttpd_rewrite.erl index 24a48248b..019651374 100644 --- a/src/chttpd/src/chttpd_rewrite.erl +++ b/src/chttpd/src/chttpd_rewrite.erl @@ -16,6 +16,9 @@ %% @doc Module for URL rewriting by pattern matching. -module(chttpd_rewrite). + +-compile(tuple_calls). + -export([handle_rewrite_req/3]). -include_lib("couch/include/couch_db.hrl"). diff --git a/src/chttpd/test/chttpd_prefer_header_test.erl b/src/chttpd/test/chttpd_prefer_header_test.erl index a8a5b3d26..0f43ba437 100644 --- a/src/chttpd/test/chttpd_prefer_header_test.erl +++ b/src/chttpd/test/chttpd_prefer_header_test.erl @@ -11,6 +11,9 @@ % the License. -module(chttpd_prefer_header_test). + +-compile(tuple_calls). + -include_lib("couch/include/couch_db.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/src/couch/src/couch_httpd.erl b/src/couch/src/couch_httpd.erl index a8cfca6d2..ec397c298 100644 --- a/src/couch/src/couch_httpd.erl +++ b/src/couch/src/couch_httpd.erl @@ -11,6 +11,9 @@ % the License. -module(couch_httpd). + +-compile(tuple_calls). + -include_lib("couch/include/couch_db.hrl"). -export([start_link/0, start_link/1, stop/0, handle_request/5]). diff --git a/src/couch/src/couch_httpd_auth.erl b/src/couch/src/couch_httpd_auth.erl index 6ac7b75af..660727195 100644 --- a/src/couch/src/couch_httpd_auth.erl +++ b/src/couch/src/couch_httpd_auth.erl @@ -11,6 +11,9 @@ % the License. -module(couch_httpd_auth). + +-compile(tuple_calls). + -include_lib("couch/include/couch_db.hrl"). -export([party_mode_handler/1]). diff --git a/src/couch/src/couch_httpd_db.erl b/src/couch/src/couch_httpd_db.erl index 81209d9ff..ced146e39 100644 --- a/src/couch/src/couch_httpd_db.erl +++ b/src/couch/src/couch_httpd_db.erl @@ -11,6 +11,9 @@ % the License. -module(couch_httpd_db). + +-compile(tuple_calls). + -include_lib("couch/include/couch_db.hrl"). -export([handle_request/1, handle_compact_req/2, handle_design_req/2, diff --git a/src/couch/src/couch_httpd_external.erl b/src/couch/src/couch_httpd_external.erl index 1f2f1e884..684f90091 100644 --- a/src/couch/src/couch_httpd_external.erl +++ b/src/couch/src/couch_httpd_external.erl @@ -12,6 +12,8 @@ -module(couch_httpd_external). +-compile(tuple_calls). + -export([handle_external_req/2, handle_external_req/3]). -export([send_external_response/2, json_req_obj/2, json_req_obj/3]). -export([default_or_content_type/2, parse_external_response/1]). diff --git a/src/couch/src/couch_httpd_proxy.erl b/src/couch/src/couch_httpd_proxy.erl index 7e9aed721..d2c7acc3a 100644 --- a/src/couch/src/couch_httpd_proxy.erl +++ b/src/couch/src/couch_httpd_proxy.erl @@ -11,6 +11,8 @@ % the License. -module(couch_httpd_proxy). +-compile(tuple_calls). + -export([handle_proxy_req/2]). -include_lib("couch/include/couch_db.hrl"). diff --git a/src/couch/src/couch_httpd_rewrite.erl b/src/couch/src/couch_httpd_rewrite.erl index e2a24218b..2845c0b16 100644 --- a/src/couch/src/couch_httpd_rewrite.erl +++ b/src/couch/src/couch_httpd_rewrite.erl @@ -16,6 +16,9 @@ %% @doc Module for URL rewriting by pattern matching. -module(couch_httpd_rewrite). + +-compile(tuple_calls). + -export([handle_rewrite_req/3]). -include_lib("couch/include/couch_db.hrl"). diff --git a/src/couch/src/couch_httpd_vhost.erl b/src/couch/src/couch_httpd_vhost.erl index f23f41da2..d8f952190 100644 --- a/src/couch/src/couch_httpd_vhost.erl +++ b/src/couch/src/couch_httpd_vhost.erl @@ -15,6 +15,8 @@ -vsn(1). -behaviour(config_listener). +-compile(tuple_calls). + -export([start_link/0, reload/0, get_state/0, dispatch_host/1]). -export([urlsplit_netloc/2, redirect_to_vhost/2]). -export([host/1, split_host_port/1]). diff --git a/src/couch/test/couchdb_http_proxy_tests.erl b/src/couch/test/couchdb_http_proxy_tests.erl index d54ff15c4..f60ba3b08 100644 --- a/src/couch/test/couchdb_http_proxy_tests.erl +++ b/src/couch/test/couchdb_http_proxy_tests.erl @@ -12,6 +12,8 @@ -module(couchdb_http_proxy_tests). +-compile(tuple_calls). + -include_lib("couch/include/couch_eunit.hrl"). -record(req, {method=get, path="", headers=[], body="", opts=[]}). diff --git a/src/couch/test/test_web.erl b/src/couch/test/test_web.erl index d568b7e45..b1b3e65c9 100644 --- a/src/couch/test/test_web.erl +++ b/src/couch/test/test_web.erl @@ -13,6 +13,8 @@ -module(test_web). -behaviour(gen_server). +-compile(tuple_calls). + -include_lib("couch/include/couch_eunit.hrl"). -export([start_link/0, stop/0, loop/1, get_port/0, set_assert/1, check_last/0]). diff --git a/src/couch_index/src/couch_index.erl b/src/couch_index/src/couch_index.erl index 8fba0a23f..cae95779e 100644 --- a/src/couch_index/src/couch_index.erl +++ b/src/couch_index/src/couch_index.erl @@ -13,6 +13,8 @@ -module(couch_index). -behaviour(gen_server). +-compile(tuple_calls). + -vsn(3). %% API diff --git a/src/fabric/src/fabric_doc_attachments.erl b/src/fabric/src/fabric_doc_attachments.erl index 7c6ba6610..723b9e804 100644 --- a/src/fabric/src/fabric_doc_attachments.erl +++ b/src/fabric/src/fabric_doc_attachments.erl @@ -12,6 +12,8 @@ -module(fabric_doc_attachments). +-compile(tuple_calls). + -include_lib("fabric/include/fabric.hrl"). -include_lib("couch/include/couch_db.hrl"). diff --git a/src/fabric/src/fabric_doc_atts.erl b/src/fabric/src/fabric_doc_atts.erl index 7ef5dd893..a3aae80ec 100644 --- a/src/fabric/src/fabric_doc_atts.erl +++ b/src/fabric/src/fabric_doc_atts.erl @@ -12,6 +12,8 @@ -module(fabric_doc_atts). +-compile(tuple_calls). + -include_lib("fabric/include/fabric.hrl"). -include_lib("couch/include/couch_db.hrl"). |