From 9921c77136a6ccba6e31cc176ec581edd040165f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 31 May 2013 10:23:49 +0000 Subject: [PATCH] From Ulrich Hertlein, "attached is a patch that fixes another clang++ compiler warning when returning std::vector::size() as 'unsigned int'. " --- include/osgGA/GUIEventAdapter | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/osgGA/GUIEventAdapter b/include/osgGA/GUIEventAdapter index 0084a6b79..22fa06127 100644 --- a/include/osgGA/GUIEventAdapter +++ b/include/osgGA/GUIEventAdapter @@ -602,6 +602,7 @@ public: else return -(2.0f*(getY()-getYmin())/(getYmax()-getYmin())-1.0f); } #endif + /// set mouse-Y orientation (mouse-Y increases upwards or downwards). void setMouseYOrientation(MouseYOrientation myo) { _mouseYOrientation = myo; } @@ -690,7 +691,7 @@ public: PointerDataList& getPointerDataList() { return _pointerDataList; } const PointerDataList& getPointerDataList() const { return _pointerDataList; } - unsigned int getNumPointerData() const { return _pointerDataList.size(); } + unsigned int getNumPointerData() const { return static_cast(_pointerDataList.size()); } PointerData* getPointerData(unsigned int i) { return _pointerDataList[i].get(); } const PointerData* getPointerData(unsigned int i) const { return _pointerDataList[i].get(); }