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

Removed reprecated C++ usage

Browse Source
This commit is contained in:
Robert Osfield
2018-11-01 09:13:43 +00:00
parent 3577fd9d90
commit 0341d6f873
2 changed files with 4 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgWidget/WindowManager
View File

@@ -285,14 +285,16 @@ class OSGWIDGET_EXPORT WindowManager: public osg::Switch, public UIObjectParent<
private:
// A functor used to sort the Windows by their Z component in descending order.
struct WindowZCompare: public std::binary_function<ptr_type, ptr_type, bool> {
struct WindowZCompare
{
bool operator()(const ptr_type& x, const ptr_type& y) {
return x.get()->getZ() > y.get()->getZ();
}
};
// A functor used to sort the Windows by their BinNum component in descending order.
struct WindowBinNumberCompare: public std::binary_function<ptr_type, ptr_type, bool> {
struct WindowBinNumberCompare
{
bool operator()(const ptr_type& x, const ptr_type& y) {
return
x.get()->getOrCreateStateSet()->getBinNumber() >