From 70d2bfed3263734d4db93c7a0e1bb9f02e43bfa2 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 12 Dec 2008 13:02:29 +0100
Subject: [PATCH] code cosmetics on std::map dumper
---
bin/gdbmacros/gdbmacros.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/bin/gdbmacros/gdbmacros.cpp b/bin/gdbmacros/gdbmacros.cpp
index ac10a4dde4f..693830b0779 100644
--- a/bin/gdbmacros/gdbmacros.cpp
+++ b/bin/gdbmacros/gdbmacros.cpp
@@ -2149,8 +2149,8 @@ static void qDumpStdList(QDumper &d)
static void qDumpStdMap(QDumper &d)
{
- const std::map<int, int> &map =
- *reinterpret_cast<const std::map<int, int> *>(d.data);
+ typedef std::map<int, int> DummyType;
+ const DummyType &map = *reinterpret_cast<const DummyType*>(d.data);
const char *keyType = d.templateParameters[0];
const char *valueType = d.templateParameters[1];
const void *p = d.data;
@@ -2159,7 +2159,7 @@ static void qDumpStdMap(QDumper &d)
int nn = map.size();
qCheck(nn >= 0);
- std::map<int, int>::const_iterator it = map.begin();
+ DummyType::const_iterator it = map.begin();
for (int i = 0; i < nn && i < 10 && it != map.end(); ++i, ++it)
qCheckAccess(it.operator->());
@@ -2175,7 +2175,7 @@ static void qDumpStdMap(QDumper &d)
int valueOffset = d.extraInt[2];
d << ",children=[";
- std::map<int, int>::const_iterator it = map.begin();
+ it = map.begin();
for (int i = 0; i < 1000 && it != map.end(); ++i, ++it) {
const void *node = it.operator->();
if (simpleKey) {
--
GitLab