Commit bd9b17e9 by Sebastian Eichelbaum

[MERGE] merged important bug fix.

parents d63723d1 63d78232
......@@ -36,6 +36,8 @@ WCondition::~WCondition()
void WCondition::wait() const
{
// since Boost 1.54, we need to explicitly lock the mutex prior to wait.
boost::unique_lock<boost::shared_mutex> lock( m_mutex );
m_condition.wait( m_mutex );
}
......
......@@ -65,7 +65,7 @@ enum WThreadedFunctionNbThreads
class WThreadedFunctionBase // NOLINT
{
//! a type for exception signals
typedef boost::signal< void ( WException const& ) > ExceptionSignal;
typedef boost::signals2::signal< void ( WException const& ) > ExceptionSignal;
public:
//! a type for exception callbacks
......@@ -175,7 +175,7 @@ template< class Function_T >
class WThreadedFunction : public WThreadedFunctionBase
{
//! a type for exception signals
typedef boost::signal< void ( WException const& ) > ExceptionSignal;
typedef boost::signals2::signal< void ( WException const& ) > ExceptionSignal;
public:
//! a type for exception callbacks
......
......@@ -29,7 +29,7 @@
#include <exception>
#include <boost/shared_ptr.hpp>
#include <boost/signal.hpp>
#include <boost/signals2/signal.hpp>
#include "WAssert.h"
#include "WException.h"
......@@ -43,10 +43,10 @@ class WWorkerThread : public WThreadedRunner
{
// typedefs
//! a type for stop signals
typedef boost::signal< void () > StopSignal;
typedef boost::signals2::signal< void () > StopSignal;
//! a type for exception signals
typedef boost::signal< void ( WException const& ) > ExceptionSignal;
typedef boost::signals2::signal< void ( WException const& ) > ExceptionSignal;
public:
//typedefs
......
......@@ -22,6 +22,9 @@
//
//---------------------------------------------------------------------------
#ifndef WOSG_H
#define WOSG_H
#include "osg/Version"
// Since OSG 3.2, OpenSceneGraph has changed several things in their Geometry class. For compilation compatibility, they provide
......@@ -32,3 +35,5 @@
#else
#define wosg osg
#endif
#endif // WOSG_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment