From 3d4a2cd013f9e62788adf902a57ae8e2f31fccc7 Mon Sep 17 00:00:00 2001
From: Iain <qt-info@nokia.com>
Date: Fri, 11 Sep 2009 11:19:23 +0200
Subject: Fix compile errors (missing uncaught_exception definition) on
 Symbian^3

When using STDCPP in Symbian^3, the definition for uncaught_exception
*must* be provided before any attempt to include e32base.h is made.

This is because STDCPP support disables the standard Symbian definition
of uncaught_exception, so the version from <exception> needs to be used
instead.

Reviewed-by: Jason Barron
---
 src/s60main/qts60main.cpp       | 1 +
 src/s60main/qts60main_mcrt0.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/s60main/qts60main.cpp b/src/s60main/qts60main.cpp
index a919593..725b17c 100644
--- a/src/s60main/qts60main.cpp
+++ b/src/s60main/qts60main.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 // INCLUDE FILES
+#include <exception> // must be before e32base.h so uncaught_exception gets defined
 #include <e32base.h>
 #include <qglobal.h>
 
diff --git a/src/s60main/qts60main_mcrt0.cpp b/src/s60main/qts60main_mcrt0.cpp
index 9439d2a..d30e07a 100644
--- a/src/s60main/qts60main_mcrt0.cpp
+++ b/src/s60main/qts60main_mcrt0.cpp
@@ -48,8 +48,8 @@
 // EPOC32 version of crt0.c for C programs which always want multi-threaded support
 
 #include <e32std.h>
+#include <exception> // must be before e32base.h so uncaught_exception gets defined
 #include <e32base.h>
-#include <exception>
 #include "estlib.h"
 
 // Needed for QT_TRYCATCH_LEAVING.
-- 
cgit v0.12