feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Compile with msvc.

Browse Source
This commit is contained in:
Roberto Raggi
2009-12-07 13:00:56 +01:00
parent bdb4e48ebf
commit a93b625697
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/cplusplus/LookupContext.cpp
View File

@@ -41,18 +41,11 @@
#include <QtDebug>
QT_BEGIN_NAMESPACE
uint qHash(const CPlusPlus::LookupItem &key)
{
const uint h1 = qHash(key.type().type());
const uint h2 = qHash(key.lastVisibleSymbol());
return ((h1 << 16) | (h1 >> 16)) ^ h2;
}
QT_END_NAMESPACE
uint CPlusPlus::qHash(const CPlusPlus::LookupItem &key)
{
return QT_PREPEND_NAMESPACE(qHash)(key);
const uint h1 = QT_PREPEND_NAMESPACE(qHash)(key.type().type());
const uint h2 = QT_PREPEND_NAMESPACE(qHash)(key.lastVisibleSymbol());
return ((h1 << 16) | (h1 >> 16)) ^ h2;
}
using namespace CPlusPlus;

8
src/libs/cplusplus/LookupContext.h
View File

@@ -232,8 +232,10 @@ uint qHash(const CPlusPlus::LookupItem &result);
} // end of namespace CPlusPlus
QT_BEGIN_NAMESPACE
uint qHash(const CPlusPlus::LookupItem &result);
QT_END_NAMESPACE
#if defined(Q_CC_MSVC) && _MSC_VER <= 1300
//this ensures that code outside QmlJS can use the hash function
//it also a workaround for some compilers
inline uint qHash(const CPlusPlus::LookupItem &item) { return CPlusPlus::qHash(item); }
#endif
#endif // CPLUSPLUS_LOOKUPCONTEXT_H