flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 11:05:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #92 clarified conditional compilation of BlackMisc::heapSizeOf

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-02-02 16:50:46 +00:00
parent f8780d0075
commit 17534e5154
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackmisc/blackmiscfreefunctions.cpp
View File

@@ -348,15 +348,6 @@ QVariant BlackMisc::complexQtTypeFromDbusArgument(const QDBusArgument &argument,
#ifdef Q_CC_MSVC #ifdef Q_CC_MSVC
#include <crtdbg.h> #include <crtdbg.h>
// surpress some GCC warnings, if someone finds
// a better solution for this, feel free
#if defined(__GCC__) || defined(__MINGW32__) || defined(__MINGW64__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-value"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
/* /*
* Heap size of an object * Heap size of an object
*/ */
@@ -391,17 +382,15 @@ size_t BlackMisc::heapSizeOf(const QMetaObject &metaObject)
_CrtMemDifference(&diff, &oldState, &newState); _CrtMemDifference(&diff, &oldState, &newState);
return diff.lSizes[_NORMAL_BLOCK]; return diff.lSizes[_NORMAL_BLOCK];
} }
#if defined(__GCC__) || defined(__MINGW32__) || defined(__MINGW64__)
#pragma GCC diagnostic pop
#endif
#else //!Q_OS_WIN32 #else //!Q_CC_MSVC
/* /*
* Heap size of an object * Heap size of an object
*/ */
size_t BlackMisc::heapSizeOf(const QMetaType &) size_t BlackMisc::heapSizeOf(const QMetaType &)
{ {
qDebug() << "heapSizeOf not supported on this OS"; qDebug() << "heapSizeOf not supported by your compiler toolchain";
return 0; return 0;
} }
/* /*
@@ -409,10 +398,11 @@ size_t BlackMisc::heapSizeOf(const QMetaType &)
*/ */
size_t BlackMisc::heapSizeOf(const QMetaObject &) size_t BlackMisc::heapSizeOf(const QMetaObject &)
{ {
qDebug() << "heapSizeOf not supported on this OS"; qDebug() << "heapSizeOf not supported by your compiler toolchain";
return 0; return 0;
} }
#endif //!Q_OS_WIN32
#endif //!Q_CC_MSVC
/* /*
* Dump all user types * Dump all user types