1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work around ICC bug about shadowing declarations that aren't shadowing

Browse Source 
Known ICC bug, still present in version 17 beta.

qdatetime.h(126): error #3280: declaration hides member "QDate::jd" (declared at line 136)

Obviously a parameter to static function or to a function in a nested
class can't shadow an NSDM.

Intel issue IDs: 0000698329 / DPD200245740
Change-Id: I149e0540c00745fe8119fffd1463c679a3a9c8c3
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Thiago Macieira 2016-07-22 18:08:49 -07:00
parent 5123dba564
commit 726c8ca0de
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qdatetime.h
View File

@ -115,8 +115,8 @@ QT_DEPRECATED inline bool setYMD(int y, int m, int d)
static bool isValid(int y, int m, int d);
static bool isLeapYear(int year);
static Q_DECL_CONSTEXPR inline QDate fromJulianDay(qint64 jd)
{ return jd >= minJd() && jd <= maxJd() ? QDate(jd) : QDate() ; }
static Q_DECL_CONSTEXPR inline QDate fromJulianDay(qint64 jd_)
{ return jd_ >= minJd() && jd_ <= maxJd() ? QDate(jd_) : QDate() ; }
Q_DECL_CONSTEXPR inline qint64 toJulianDay() const { return jd; }
private:

12
src/corelib/tools/qsharedpointer_impl.h
View File

@ -486,14 +486,14 @@ private:
void deref() Q_DECL_NOTHROW
{ deref(d); }
static void deref(Data *d) Q_DECL_NOTHROW
static void deref(Data *dd) Q_DECL_NOTHROW
{
if (!d) return;
if (!d->strongref.deref()) {
d->destroy();
if (!dd) return;
if (!dd->strongref.deref()) {
dd->destroy();
}
if (!d->weakref.deref())
delete d;
if (!dd->weakref.deref())
delete dd;
}
template <class X>

2
src/gui/kernel/qevent.h
View File

@ -524,7 +524,7 @@ public:
};
class Attribute {
public:
Attribute(AttributeType t, int s, int l, QVariant val) : type(t), start(s), length(l), value(qMove(val)) {}
Attribute(AttributeType typ, int s, int l, QVariant val) : type(typ), start(s), length(l), value(qMove(val)) {}
AttributeType type;
int start;