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

Fix the build if st_atimensec is defined

Browse Source 
It's a trick used by some C libraries to keep compatibility with BSD
extensions while supporting POSIX.1-2008 API. st_atimensec is defined as
st_atim.tv_nsec, so the code would expand to invalid C++

 In substitution of 'template<class T> typename std::enable_if<((&T::st_atim.tv_nsec), true), long long int>::type{anonymous}::GetFileTimes::atime(const T&, int) [with T = stat]':
 error: invalid use of non-static data member 'stat::st_atim'

Change-Id: I38341f8155354cc4a776fffd14e20f4fc0f6d5bb
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Thiago Macieira 2017-09-07 08:01:00 -03:00 committed by Jani Heikkinen
parent 915a81d712
commit 2aaf575319
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/io/qfilesystemengine_unix.cpp
View File

@ -202,6 +202,8 @@ static inline typename QtPrivate::QEnableIf<(&T::st_atimespec, &T::st_mtimespec,
modification->tv_usec = p->st_mtimespec.tv_nsec / 1000; modification->tv_usec = p->st_mtimespec.tv_nsec / 1000;
} }
# ifndef st_atimensec
// if "st_atimensec" is defined, this would expand to invalid C++
template <typename T> template <typename T>
static inline typename QtPrivate::QEnableIf<(&T::st_atimensec, &T::st_mtimensec, true)>::Type get(const T *p, struct timeval *access, struct timeval *modification) static inline typename QtPrivate::QEnableIf<(&T::st_atimensec, &T::st_mtimensec, true)>::Type get(const T *p, struct timeval *access, struct timeval *modification)
{ {
@ -211,6 +213,7 @@ static inline typename QtPrivate::QEnableIf<(&T::st_atimensec, &T::st_mtimensec,
modification->tv_sec = p->st_mtime; modification->tv_sec = p->st_mtime;
modification->tv_usec = p->st_mtimensec / 1000; modification->tv_usec = p->st_mtimensec / 1000;
} }
# endif
#endif #endif
qint64 timespecToMSecs(const timespec &spec) qint64 timespecToMSecs(const timespec &spec)
@ -268,6 +271,7 @@ mtime(const T &statBuffer, int)
{ return timespecToMSecs(statBuffer.st_mtimespec); } { return timespecToMSecs(statBuffer.st_mtimespec); }
#endif #endif
#ifndef st_mtimensec
// Xtimensec // Xtimensec
template <typename T> template <typename T>
Q_DECL_UNUSED static typename std::enable_if<(&T::st_atimensec, true), qint64>::type Q_DECL_UNUSED static typename std::enable_if<(&T::st_atimensec, true), qint64>::type
@ -288,8 +292,9 @@ template <typename T>
Q_DECL_UNUSED static typename std::enable_if<(&T::st_mtimensec, true), qint64>::type Q_DECL_UNUSED static typename std::enable_if<(&T::st_mtimensec, true), qint64>::type
mtime(const T &statBuffer, int) mtime(const T &statBuffer, int)
{ return statBuffer.st_mtime * Q_INT64_C(1000) + statBuffer.st_mtimensec / 1000000; } { return statBuffer.st_mtime * Q_INT64_C(1000) + statBuffer.st_mtimensec / 1000000; }
} #endif
} } // namespace GetFileTimes
} // unnamed namespace
#ifdef STATX_BASIC_STATS #ifdef STATX_BASIC_STATS
static int qt_real_statx(int fd, const char *pathname, int flags, struct statx *statxBuffer) static int qt_real_statx(int fd, const char *pathname, int flags, struct statx *statxBuffer)