[OpenWalnut-Dev] [OWci] r7435: [CHANGE] boost::optional does not provide implicit casts, hence explicit comparison is made for bool, to provide standard conformity to c++11.
Sebastian Eichelbaum
privat at sebastian-eichelbaum.de
Mon Aug 17 14:24:27 CEST 2015
Please also check style. It seems rightbuttonpush braces do not include a space.
math <math at informatik.uni-leipzig.de> schrieb am 17.08.2015:
>*Branch OpenWalnut_1.4*
>[CHANGE] boost::optional does not provide implicit casts, hence
>explicit comparison is made for bool, to provide standard conformity to
>c++11.
>
>changeset 7435:020c40921e37 in /srv/hg/ow (Mon Aug 17 14:21:30 2015
>+0200):
>
>http://www.openwalnut.org/projects/openwalnut/repository/revisions/7435
>
>diffstat:
>
>src/modules/clusterDisplay/WMClusterDisplay.cpp
> | 2 +-
>src/modules/hierarchicalClustering/hierchClustDisplay/WMHierchClustDisplay.cpp
>| 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diffs (29 lines):
>
>diff -r 9bfbba026df2 -r 020c40921e37
>src/modules/clusterDisplay/WMClusterDisplay.cpp
>--- a/src/modules/clusterDisplay/WMClusterDisplay.cpp Mon Aug 17
>10:46:54 2015 +0200
>+++ b/src/modules/clusterDisplay/WMClusterDisplay.cpp Mon Aug 17
>14:21:30 2015 +0200
>@@ -57,7 +57,7 @@
>// wlog::debug( "WMClusterDisplay::MainViewEventHandler" ) <<
>"handle";
>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;
> }
>diff -r 9bfbba026df2 -r 020c40921e37
>src/modules/hierarchicalClustering/hierchClustDisplay/WMHierchClustDisplay.cpp
>---
>a/src/modules/hierarchicalClustering/hierchClustDisplay/WMHierchClustDisplay.cpp Mon
>Aug 17 10:46:54 2015 +0200
>+++
>b/src/modules/hierarchicalClustering/hierchClustDisplay/WMHierchClustDisplay.cpp Mon
>Aug 17 14:21:30 2015 +0200
>@@ -85,11 +85,11 @@
>// wlog::debug( "WMHierchClustDisplay::MainViewEventHandler" ) <<
>"handle";
>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 )
> {
>- return m_signalRightButtonPush( WVector2f( ea.getX(),
>ea.getY() ) );
>+ return (true == m_signalRightButtonPush( WVector2f( ea.getX(),
>ea.getY() ) ) );
> }
> return false;
> }
>_______________________________________________
>All-openwalnut-commits mailing list
>All-openwalnut-commits at lists.informatik.uni-leipzig.de
>http://lists.informatik.uni-leipzig.de/mailman/listinfo/all-openwalnut-commits
More information about the OpenWalnut-Dev
mailing list