Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EF170200BF9 for ; Sun, 8 Jan 2017 22:20:56 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id ED9C7160B1F; Sun, 8 Jan 2017 21:20:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 467DD160B45 for ; Sun, 8 Jan 2017 22:20:56 +0100 (CET) Received: (qmail 81453 invoked by uid 500); 8 Jan 2017 21:20:55 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 81444 invoked by uid 99); 8 Jan 2017 21:20:55 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2017 21:20:55 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id D36401800B7 for ; Sun, 8 Jan 2017 21:20:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id FHfbXsnGKA6k for ; Sun, 8 Jan 2017 21:20:54 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 2328D5F30B for ; Sun, 8 Jan 2017 21:20:52 +0000 (UTC) Received: (qmail 81088 invoked by uid 99); 8 Jan 2017 21:20:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2017 21:20:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 512EADFF0F; Sun, 8 Jan 2017 21:20:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Sun, 08 Jan 2017 21:20:30 -0000 Message-Id: <30b0839be5ea43ed8a4daf3e001e597f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/13] incubator-freemarker git commit: removing the unwanted additions due to merge archived-at: Sun, 08 Jan 2017 21:20:57 -0000 removing the unwanted additions due to merge Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/8e5e8a2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/8e5e8a2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/8e5e8a2a Branch: refs/heads/2.3-gae Commit: 8e5e8a2ab570bad61e5cc2fd93bf3c9eaabd3484 Parents: cd45f54 Author: Pradeep Authored: Mon Jan 11 21:29:33 2016 +0530 Committer: Pradeep Committed: Mon Jan 11 21:29:33 2016 +0530 ---------------------------------------------------------------------- src/main/java/freemarker/core/BuiltIn.java | 2 +- src/main/java/freemarker/core/BuiltinVariable.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8e5e8a2a/src/main/java/freemarker/core/BuiltIn.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/BuiltIn.java b/src/main/java/freemarker/core/BuiltIn.java index c9d93d5..5edcb20 100644 --- a/src/main/java/freemarker/core/BuiltIn.java +++ b/src/main/java/freemarker/core/BuiltIn.java @@ -84,7 +84,7 @@ abstract class BuiltIn extends Expression implements Cloneable { static final Set CAMEL_CASE_NAMES = new TreeSet(); static final Set SNAKE_CASE_NAMES = new TreeSet(); static final int NUMBER_OF_BIS = 263; - static final HashMap builtins = new HashMap(NUMBER_OF_BIS * 3 / 2 + 1, 1f); + static final HashMap BUILT_INS_BY_NAME = new HashMap(NUMBER_OF_BIS * 3 / 2 + 1, 1f); static { // Note that you must update NUMBER_OF_BIS if you add new items here! http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8e5e8a2a/src/main/java/freemarker/core/BuiltinVariable.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/BuiltinVariable.java b/src/main/java/freemarker/core/BuiltinVariable.java index ee1f319..1ceb64e 100644 --- a/src/main/java/freemarker/core/BuiltinVariable.java +++ b/src/main/java/freemarker/core/BuiltinVariable.java @@ -74,7 +74,6 @@ final class BuiltinVariable extends Expression { static final String NOW = "now"; static final String PREVIOUS_SIBLING = "previous"; static final String NEXT_SIBLING = "next"; - private static final BoundCallable PASS_VALUE = new BoundCallable(UnboundCallable.NO_OP_MACRO, null, null); static final String[] SPEC_VAR_NAMES = new String[] { AUTO_ESC_CC,