Skip to content

Commit

Permalink
Final 3.2.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Koen Deforche committed Jul 23, 2012
1 parent 06537ef commit 9edc6fa
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
5 changes: 5 additions & 0 deletions Changelog
@@ -1,3 +1,8 @@
23-07-2012:
* WebController: workaround filesystem runtime problem for boost 1.50

* Wt-3.2.2

16-07-2012: 16-07-2012:
* Wt: fix compile issues with boost 1.50 * Wt: fix compile issues with boost 1.50


Expand Down
2 changes: 1 addition & 1 deletion ReleaseNotes.html
Expand Up @@ -22,7 +22,7 @@ <h1>Wt Release notes</h1>
the way you build Wt, the way you configure Wt or the Wt API and the way you build Wt, the way you configure Wt or the Wt API and
behaviour. behaviour.


<h2>Release 3.2.2-rc2 (July, 16 2012)</h2> <h2>Release 3.2.2 (July, 23 2012)</h2>


<p> <p>
This release contains mostly bug and feature improvements, but This release contains mostly bug and feature improvements, but
Expand Down
16 changes: 16 additions & 0 deletions src/web/WebController.C
Expand Up @@ -39,6 +39,11 @@
#include <magick/api.h> #include <magick/api.h>
#endif #endif


#ifndef WT_HAVE_POSIX_FILEIO
// boost bug workaround: see WebController constructor
#include <boost/filesystem.hpp>
#endif

namespace Wt { namespace Wt {


LOGGER("WebController"); LOGGER("WebController");
Expand All @@ -65,6 +70,17 @@ WebController::WebController(WServer& server,
#ifdef HAVE_RASTER_IMAGE #ifdef HAVE_RASTER_IMAGE
InitializeMagick(0); InitializeMagick(0);
#endif #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() WebController::~WebController()
Expand Down

0 comments on commit 9edc6fa

Please sign in to comment.