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 <[email protected]> Authored: Mon Jan 11 21:29:33 2016 +0530 Committer: Pradeep <[email protected]> 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<String> CAMEL_CASE_NAMES = new TreeSet<String>(); static final Set<String> SNAKE_CASE_NAMES = new TreeSet<String>(); static final int NUMBER_OF_BIS = 263; - static final HashMap builtins = new HashMap(NUMBER_OF_BIS * 3 / 2 + 1, 1f); + static final HashMap<String, BuiltIn> 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,
