FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Ulrich Hertlein, "attached is a patch that fixes another clang++ compiler warning when returning

Browse Source 
std::vector::size() as 'unsigned int'.
"
This commit is contained in:
Robert Osfield 2013-05-31 10:23:49 +00:00
parent b6579c5c4a
commit 9921c77136
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgGA/GUIEventAdapter
View File

@ -602,6 +602,7 @@ public:
else return -(2.0f*(getY()-getYmin())/(getYmax()-getYmin())-1.0f); else return -(2.0f*(getY()-getYmin())/(getYmax()-getYmin())-1.0f);
} }
#endif #endif
/// set mouse-Y orientation (mouse-Y increases upwards or downwards). /// set mouse-Y orientation (mouse-Y increases upwards or downwards).
void setMouseYOrientation(MouseYOrientation myo) { _mouseYOrientation = myo; } void setMouseYOrientation(MouseYOrientation myo) { _mouseYOrientation = myo; }
@ -690,7 +691,7 @@ public:
PointerDataList& getPointerDataList() { return _pointerDataList; } PointerDataList& getPointerDataList() { return _pointerDataList; }
const PointerDataList& getPointerDataList() const { return _pointerDataList; } const PointerDataList& getPointerDataList() const { return _pointerDataList; }
unsigned int getNumPointerData() const { return _pointerDataList.size(); } unsigned int getNumPointerData() const { return static_cast<unsigned int>(_pointerDataList.size()); }
PointerData* getPointerData(unsigned int i) { return _pointerDataList[i].get(); } PointerData* getPointerData(unsigned int i) { return _pointerDataList[i].get(); }
const PointerData* getPointerData(unsigned int i) const { return _pointerDataList[i].get(); } const PointerData* getPointerData(unsigned int i) const { return _pointerDataList[i].get(); }