From 68160cfa8b1de80aee7548efb83e6f952ceb675b Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 20 Nov 2009 10:28:17 +0100
Subject: [PATCH] compile fix with namespaced Qt
---
src/libs/cplusplus/LookupContext.cpp | 2 ++
src/libs/cplusplus/LookupContext.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 3c60dda6410..96bd8efda30 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -43,12 +43,14 @@
using namespace CPlusPlus;
+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
/////////////////////////////////////////////////////////////////////
// LookupContext
diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h
index a5aeb69b174..3eca2fce315 100644
--- a/src/libs/cplusplus/LookupContext.h
+++ b/src/libs/cplusplus/LookupContext.h
@@ -231,7 +231,9 @@ private:
} // end of namespace CPlusPlus
+QT_BEGIN_NAMESPACE
uint qHash(const CPlusPlus::LookupItem &result);
+QT_END_NAMESPACE
#endif // CPLUSPLUS_LOOKUPCONTEXT_H
--
GitLab