Merge
authorjjg
Thu, 21 May 2015 13:48:23 -0700
changeset 30733 f4b21d02e886
parent 30732 bce32ab8601e (diff)
parent 30731 38eaf2ca243e (current diff)
child 30734 271924202c97
Merge
--- a/langtools/test/tools/javac/proprietary/WarnClass.out	Thu May 21 21:15:28 2015 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnClass.out	Thu May 21 13:48:23 2015 -0700
@@ -1,4 +1,4 @@
-WarnClass.java:12:40: compiler.warn.sun.proprietary: sun.misc.Lock
+WarnClass.java:13:40: compiler.warn.sun.proprietary: sun.misc.Lock
 - compiler.err.warnings.and.werror
 1 error
 1 warning
--- a/langtools/test/tools/javac/proprietary/WarnMethod.out	Thu May 21 21:15:28 2015 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnMethod.out	Thu May 21 13:48:23 2015 -0700
@@ -1,4 +1,4 @@
-WarnMethod.java:14:36: compiler.warn.sun.proprietary: sun.misc.VM
+WarnMethod.java:15:36: compiler.warn.sun.proprietary: sun.misc.VM
 - compiler.err.warnings.and.werror
 1 error
 1 warning
--- a/langtools/test/tools/javac/proprietary/WarnVariable.out	Thu May 21 21:15:28 2015 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnVariable.out	Thu May 21 13:48:23 2015 -0700
@@ -1,4 +1,4 @@
-WarnVariable.java:14:36: compiler.warn.sun.proprietary: sun.misc.FloatConsts
+WarnVariable.java:15:36: compiler.warn.sun.proprietary: sun.misc.FloatConsts
 - compiler.err.warnings.and.werror
 1 error
 1 warning
--- a/langtools/test/tools/javac/proprietary/WarnWildcard.out	Thu May 21 21:15:28 2015 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnWildcard.out	Thu May 21 13:48:23 2015 -0700
@@ -1,4 +1,4 @@
-WarnWildcard.java:13:44: compiler.warn.sun.proprietary: sun.misc.FloatConsts
+WarnWildcard.java:14:44: compiler.warn.sun.proprietary: sun.misc.FloatConsts
 - compiler.err.warnings.and.werror
 1 error
 1 warning