mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-10-21 13:28:48 -07:00
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
26 lines
995 B
Diff
26 lines
995 B
Diff
--- src/decl.cpp 2004/09/26 22:40:411.144
|
|
+++ src/decl.cpp 2004/10/09 18:04:501.145
|
|
@@ -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
|
|
@@ -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;
|