Commit 95178d26 authored by Mathias Goldau's avatar Mathias Goldau

[CHANGE] boost::optional does not provide implicit casts, hence explicit...

[CHANGE] boost::optional does not provide implicit casts, hence explicit comparison is made for bool, to provide standard conformity to c++11.
parent 4b29d8c8
...@@ -57,7 +57,7 @@ bool WMClusterDisplay::MainViewEventHandler::handle( const osgGA::GUIEventAdapte ...@@ -57,7 +57,7 @@ bool WMClusterDisplay::MainViewEventHandler::handle( const osgGA::GUIEventAdapte
// wlog::debug( "WMClusterDisplay::MainViewEventHandler" ) << "handle"; // wlog::debug( "WMClusterDisplay::MainViewEventHandler" ) << "handle";
if( ea.getEventType() == GUIEvents::PUSH && ea.getButton() == osgGA::GUIEventAdapter::LEFT_MOUSE_BUTTON ) if( ea.getEventType() == GUIEvents::PUSH && ea.getButton() == osgGA::GUIEventAdapter::LEFT_MOUSE_BUTTON )
{ {
return m_signalLeftButtonPush( WVector2f( ea.getX(), ea.getY() ) ); return ( true == m_signalLeftButtonPush( WVector2f( ea.getX(), ea.getY() ) ) );
} }
return false; return false;
} }
......
...@@ -85,11 +85,11 @@ bool WMHierchClustDisplay::MainViewEventHandler::handle( const osgGA::GUIEventAd ...@@ -85,11 +85,11 @@ bool WMHierchClustDisplay::MainViewEventHandler::handle( const osgGA::GUIEventAd
// wlog::debug( "WMHierchClustDisplay::MainViewEventHandler" ) << "handle"; // wlog::debug( "WMHierchClustDisplay::MainViewEventHandler" ) << "handle";
if( ea.getEventType() == osgGA::GUIEventAdapter::PUSH && ea.getButton() == osgGA::GUIEventAdapter::LEFT_MOUSE_BUTTON ) if( ea.getEventType() == osgGA::GUIEventAdapter::PUSH && ea.getButton() == osgGA::GUIEventAdapter::LEFT_MOUSE_BUTTON )
{ {
return m_signalLeftButtonPush( WVector2f( ea.getX(), ea.getY() ) ); return ( true == m_signalLeftButtonPush( WVector2f( ea.getX(), ea.getY() ) ) );
} }
if( ea.getEventType() == osgGA::GUIEventAdapter::PUSH && ea.getButton() == osgGA::GUIEventAdapter::RIGHT_MOUSE_BUTTON ) if( ea.getEventType() == osgGA::GUIEventAdapter::PUSH && ea.getButton() == osgGA::GUIEventAdapter::RIGHT_MOUSE_BUTTON )
{ {
return m_signalRightButtonPush( WVector2f( ea.getX(), ea.getY() ) ); return (true == m_signalRightButtonPush( WVector2f( ea.getX(), ea.getY() ) ) );
} }
return false; return false;
} }
......
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