diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2004-10-12 19:21:14 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2004-10-12 19:21:14 +0000 |
| commit | 66bc392c5ed7b7447b3ebc2a42c6b218f8b379fb (patch) | |
| tree | c549844ef884ac1ddb82bd57c9de8658995afaa2 /dev-java/jikes/files | |
| parent | made jikes happy, closes 66977 (Manifest recommit) (diff) | |
| download | gentoo-2-66bc392c5ed7b7447b3ebc2a42c6b218f8b379fb.tar.gz gentoo-2-66bc392c5ed7b7447b3ebc2a42c6b218f8b379fb.tar.bz2 gentoo-2-66bc392c5ed7b7447b3ebc2a42c6b218f8b379fb.zip | |
upstream patch closes bug 66977,66840
Diffstat (limited to 'dev-java/jikes/files')
| -rw-r--r-- | dev-java/jikes/files/deprecated.patch | 37 | ||||
| -rw-r--r-- | dev-java/jikes/files/digest-jikes-1.22-r1 | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/dev-java/jikes/files/deprecated.patch b/dev-java/jikes/files/deprecated.patch new file mode 100644 index 000000000000..1eee5be86db6 --- /dev/null +++ b/dev-java/jikes/files/deprecated.patch @@ -0,0 +1,37 @@ +--- src/decl.cpp 2004/09/26 22:40:411.144 ++++ src/decl.cpp 2004/10/09 18:04:501.145 +@@ -1,4 +1,4 @@ +-// $Id: deprecated.patch,v 1.1 2004/10/12 19:21:14 axxo Exp $ ++// $Id: deprecated.patch,v 1.1 2004/10/12 19:21:14 axxo Exp $ + // + // This software is subject to the terms of the IBM Jikes Compiler + // License Agreement available at the following URL: +@@ -2596,7 +2596,9 @@ + // + if (control.option.deprecation && + hidden_method -> IsDeprecated() && +- ! method -> containing_type -> file_symbol -> IsClassOnly()) ++ ! method -> containing_type -> file_symbol -> IsClassOnly() && ++ ! method -> IsDeprecated() && ++ ! InDeprecatedContext()) + { + ReportSemError(SemanticError::DEPRECATED_METHOD_OVERRIDE, + left_tok, right_tok, method -> Header(), + +diff -u -r1.159 -r1.160 +--- src/error.cpp 2004/09/26 22:40:411.159 ++++ src/error.cpp 2004/10/10 02:59:401.160 +@@ -1,4 +1,4 @@ +-// $Id: deprecated.patch,v 1.1 2004/10/12 19:21:14 axxo Exp $ ++// $Id: deprecated.patch,v 1.1 2004/10/12 19:21:14 axxo Exp $ + // + // This software is subject to the terms of the IBM Jikes Compiler + // License Agreement available at the following URL: +@@ -513,6 +513,7 @@ + warning[DEPRECATED_FIELD] = WEAK_WARNING; + warning[DEPRECATED_METHOD] = WEAK_WARNING; + warning[DEPRECATED_CONSTRUCTOR] = WEAK_WARNING; ++ warning[DEPRECATED_METHOD_OVERRIDE] = WEAK_WARNING; + + warning[UNNECESSARY_TYPE_IMPORT] = WEAK_WARNING; + warning[MULTIPLE_PUBLIC_TYPES] = WEAK_WARNING; diff --git a/dev-java/jikes/files/digest-jikes-1.22-r1 b/dev-java/jikes/files/digest-jikes-1.22-r1 new file mode 100644 index 000000000000..cee0fd1c2e51 --- /dev/null +++ b/dev-java/jikes/files/digest-jikes-1.22-r1 @@ -0,0 +1 @@ +MD5 cda958c7fef6b43b803e1d1ef9afcb85 jikes-1.22.tar.bz2 616655 |