aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Thiago Macieira <thiago@macieira.org>2013-10-03 13:34:50 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-03 13:47:24 -0700
commitad52301ca7f5afe42bf634546605094ba1f4caf9 (patch)
tree21f2e38c2c2f0898a2d72516833ccf074cf3ba10
parent7a368ab06b4926236ec93207e66ff7b14c234fe1 (diff)
downloadsubsurface-ad52301ca7f5afe42bf634546605094ba1f4caf9.tar.gz
Turn off Qt including the C++ Standard Library headers
We don't use any of the Standard Library features or classes in Subsurface, except for three uses of std::sort, for which I added the necessary #include. It's always a good idea to include directly the headers you want, without relying on indirect inclusion On my machine, the build time dropped from 16.96s to 13.38s or a 12% improvement. Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--Makefile2
-rw-r--r--qt-ui/diveplanner.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5258d3dbd..1e193eb22 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ XSLTFILES = xslt/*.xslt xslt/*.xsl
EXTRA_FLAGS = $(QTCXXFLAGS) $(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \
$(LIBDIVECOMPUTERCFLAGS) \
- $(LIBSOUPCFLAGS) $(GCONF2CFLAGS) -I.
+ $(LIBSOUPCFLAGS) $(GCONF2CFLAGS) -I. -DQT_NO_STL
HEADERS = \
qt-ui/divelistview.h \
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index 917863968..d183b4a15 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -23,6 +23,8 @@
#include <QTableView>
#include <QColor>
+#include <algorithm>
+
#define TIME_INITIAL_MAX 30
#define MAX_DEPTH M_OR_FT(150, 450)