groovy git commit: fix build

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

groovy git commit: fix build

paulk
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X a7e5722be -> 12c526268


fix build


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/12c52626
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/12c52626
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/12c52626

Branch: refs/heads/GROOVY_2_6_X
Commit: 12c5262687b121fb4b31d04ab7e8a031bcbc8849
Parents: a7e5722
Author: Paul King <[hidden email]>
Authored: Mon Apr 16 16:26:07 2018 +1000
Committer: Paul King <[hidden email]>
Committed: Mon Apr 16 16:26:07 2018 +1000

----------------------------------------------------------------------
 .../java/org/codehaus/groovy/control/CompilerConfiguration.java    | 2 +-
 .../java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/12c52626/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index bc0cf6c..76a24e1 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -957,7 +957,7 @@ public class CompilerConfiguration {
                     }
                 }
 
-                private ClassCodeVisitorSupport newClassCodeVisitor(SourceUnit source) {
+                private ClassCodeVisitorSupport newClassCodeVisitor(final SourceUnit source) {
                     return new ClassCodeVisitorSupport() {
                         @Override
                         public void visitClass(ClassNode node) {

http://git-wip-us.apache.org/repos/asf/groovy/blob/12c52626/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index 0902b1e..fe08a33 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -12224,7 +12224,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
      * @since 1.5.6
      */
     public static <T> Collection<T> intersect(Collection<T> left, Collection<T> right) {
-        return intersect(left, right, new NumberAwareComparator<>());
+        return intersect(left, right, new NumberAwareComparator<T>());
     }
 
     /**