8024093: Two *.rej files checked in to langtools/test directory

Fri, 30 Aug 2013 15:14:51 -0700

author
jjg
date
Fri, 30 Aug 2013 15:14:51 -0700
changeset 1994
3dd40e5715fb
parent 1993
240f424cc0d5
child 1995
dd64288f5659

8024093: Two *.rej files checked in to langtools/test directory
Reviewed-by: mchung

test/tools/javac/diags/examples/MrefStat.java.rej file | annotate | diff | comparison | revisions
test/tools/javac/diags/examples/MrefStat1.java.rej file | annotate | diff | comparison | revisions
     1.1 --- a/test/tools/javac/diags/examples/MrefStat.java.rej	Fri Aug 30 11:48:36 2013 -0700
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,34 +0,0 @@
     1.4 ---- MrefStat.java
     1.5 -+++ MrefStat.java
     1.6 -@@ -0,0 +1,31 @@
     1.7 -+/*
     1.8 -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     1.9 -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    1.10 -+ *
    1.11 -+ * This code is free software; you can redistribute it and/or modify it
    1.12 -+ * under the terms of the GNU General Public License version 2 only, as
    1.13 -+ * published by the Free Software Foundation.
    1.14 -+ *
    1.15 -+ * This code is distributed in the hope that it will be useful, but WITHOUT
    1.16 -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    1.17 -+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    1.18 -+ * version 2 for more details (a copy is included in the LICENSE file that
    1.19 -+ * accompanied this code).
    1.20 -+ *
    1.21 -+ * You should have received a copy of the GNU General Public License version
    1.22 -+ * 2 along with this work; if not, write to the Free Software Foundation,
    1.23 -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1.24 -+ *
    1.25 -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    1.26 -+ * or visit www.oracle.com if you need additional information or have any
    1.27 -+ * questions.
    1.28 -+ */
    1.29 -+
    1.30 -+// key: compiler.note.mref.stat
    1.31 -+// options: -XDdumpLambdaToMethodStats
    1.32 -+
    1.33 -+class MrefStat {
    1.34 -+    Runnable r = MrefStat::m;
    1.35 -+    
    1.36 -+    static void m() { }
    1.37 -+}
     2.1 --- a/test/tools/javac/diags/examples/MrefStat1.java.rej	Fri Aug 30 11:48:36 2013 -0700
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,37 +0,0 @@
     2.4 ---- MrefStat1.java
     2.5 -+++ MrefStat1.java
     2.6 -@@ -0,0 +1,34 @@
     2.7 -+/*
     2.8 -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     2.9 -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2.10 -+ *
    2.11 -+ * This code is free software; you can redistribute it and/or modify it
    2.12 -+ * under the terms of the GNU General Public License version 2 only, as
    2.13 -+ * published by the Free Software Foundation.
    2.14 -+ *
    2.15 -+ * This code is distributed in the hope that it will be useful, but WITHOUT
    2.16 -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.17 -+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.18 -+ * version 2 for more details (a copy is included in the LICENSE file that
    2.19 -+ * accompanied this code).
    2.20 -+ *
    2.21 -+ * You should have received a copy of the GNU General Public License version
    2.22 -+ * 2 along with this work; if not, write to the Free Software Foundation,
    2.23 -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.24 -+ *
    2.25 -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.26 -+ * or visit www.oracle.com if you need additional information or have any
    2.27 -+ * questions.
    2.28 -+ */
    2.29 -+
    2.30 -+// key: compiler.note.mref.stat.1
    2.31 -+// options: -XDdumpLambdaToMethodStats
    2.32 -+
    2.33 -+class MrefStat1 {    
    2.34 -+    
    2.35 -+    void m() { }
    2.36 -+    
    2.37 -+    static class Sub extends MrefStat1 {
    2.38 -+        Runnable r = super::m;
    2.39 -+    }
    2.40 -+}

mercurial