From 9edc6fa04fd06d74413d8b9f20a9a3b642a89e5e Mon Sep 17 00:00:00 2001 From: Koen Deforche Date: Mon, 23 Jul 2012 08:35:51 +0200 Subject: [PATCH] Final 3.2.2 release --- Changelog | 5 +++++ ReleaseNotes.html | 2 +- src/web/WebController.C | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index d80242e3b2..961ca44097 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,8 @@ +23-07-2012: + * WebController: workaround filesystem runtime problem for boost 1.50 + + * Wt-3.2.2 + 16-07-2012: * Wt: fix compile issues with boost 1.50 diff --git a/ReleaseNotes.html b/ReleaseNotes.html index 8dd39592ca..6b64e5f823 100644 --- a/ReleaseNotes.html +++ b/ReleaseNotes.html @@ -22,7 +22,7 @@

Wt Release notes

the way you build Wt, the way you configure Wt or the Wt API and behaviour. -

Release 3.2.2-rc2 (July, 16 2012)

+

Release 3.2.2 (July, 23 2012)

This release contains mostly bug and feature improvements, but diff --git a/src/web/WebController.C b/src/web/WebController.C index 11242cb192..75bd452709 100644 --- a/src/web/WebController.C +++ b/src/web/WebController.C @@ -39,6 +39,11 @@ #include #endif +#ifndef WT_HAVE_POSIX_FILEIO +// boost bug workaround: see WebController constructor +#include +#endif + namespace Wt { LOGGER("WebController"); @@ -65,6 +70,17 @@ WebController::WebController(WServer& server, #ifdef HAVE_RASTER_IMAGE InitializeMagick(0); #endif + +#ifndef WT_HAVE_POSIX_FILEIO + // attempted workaround for: + // https://svn.boost.org/trac/boost/ticket/6320 + // https://svn.boost.org/trac/boost/ticket/4889 + // https://svn.boost.org/trac/boost/ticket/6690 + // https://svn.boost.org/trac/boost/ticket/6737 + // Invoking the path constructor here should create the global variables + // in boost.filesystem before the threads are started. + boost::filesystem::path bugFixFilePath("please-initialize-globals"); +#endif } WebController::~WebController()