summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-09-30 11:21:29 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-09-30 11:26:00 (GMT)
commitd6244e6e5f8bb769176e07e957ec5ce93be72b55 (patch)
treec3d7c9d6bfdfc773644d83f7271f454d78cb01ea /src/3rdparty
parent3cbde9651eab58c56b62d65b6fa4d9269bde0844 (diff)
downloadQt-d6244e6e5f8bb769176e07e957ec5ce93be72b55.zip
Qt-d6244e6e5f8bb769176e07e957ec5ce93be72b55.tar.gz
Qt-d6244e6e5f8bb769176e07e957ec5ce93be72b55.tar.bz2
Compile on VS2003
The compiler complained about ambiguity in calls to make_pair because there is also a "using std::make_pair" in the WTF namespace (wtf/HashTraits.h). Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp
index 05e3d7b..f7bda9e 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp
@@ -46,7 +46,6 @@
#define DO_PROPERTYMAP_CONSTENCY_CHECK 0
#endif
-using namespace std;
using namespace WTF;
namespace JSC {