summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/corelib/tools/qvector/qrawvector.h
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2021-07-08 15:38:22 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2021-07-19 16:55:51 +0000
commita87411cefae1214aca370bd73c2000c309496fb5 (patch)
tree14d2377f0825f55bd8987a77833fd24a611890f1 /tests/benchmarks/corelib/tools/qvector/qrawvector.h
parent406bb11a4ebf3e166416a399807ec2ad8d1baede (diff)
Clean up old QVector benchmark
Purge comments showing assember from an antique g++ version, skip #if-ery that's always been on, so makes no difference, rename two single-letter variables shared between files, move some extern declarations to a header, wrap parts of a source file in QT_{BEGIN,END}_NAMESPACE, add a TODO against an antique commented out #if-ery kludge. Change-Id: Ic4781960e0c9838027c21d3d392a50f29598132c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/benchmarks/corelib/tools/qvector/qrawvector.h')
-rw-r--r--tests/benchmarks/corelib/tools/qvector/qrawvector.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/benchmarks/corelib/tools/qvector/qrawvector.h b/tests/benchmarks/corelib/tools/qvector/qrawvector.h
index 3d827c7921..df3c11b223 100644
--- a/tests/benchmarks/corelib/tools/qvector/qrawvector.h
+++ b/tests/benchmarks/corelib/tools/qvector/qrawvector.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtCore module of the Qt Toolkit.
@@ -41,8 +41,16 @@
#include <stdlib.h>
#include <string.h>
-QT_BEGIN_NAMESPACE
+const int million = 1000000;
+extern double accumulate;
+
+// Defined in outofline.cpp
+extern QVector<double> qvector_fill_and_return_helper();
+extern QVector<double> qrawvector_fill_and_return_helper();
+extern std::vector<double> stdvector_fill_and_return_helper();
+extern QVector<double> mixedvector_fill_and_return_helper();
+QT_BEGIN_NAMESPACE
struct QVectorData
{