From abb7f46371eee19b7bc6f5ea804ff559c39311e6 Mon Sep 17 00:00:00 2001 From: Hartwig Date: Sun, 22 Oct 2017 13:47:51 +0200 Subject: [PATCH 1/3] Removal of compiler warning for Cocoa builds --- src/osgViewer/GraphicsWindowCocoa.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgViewer/GraphicsWindowCocoa.mm b/src/osgViewer/GraphicsWindowCocoa.mm index bbca00de9..14f6fcb5f 100644 --- a/src/osgViewer/GraphicsWindowCocoa.mm +++ b/src/osgViewer/GraphicsWindowCocoa.mm @@ -199,7 +199,7 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect) // the app-delegate, handling quit-requests // ---------------------------------------------------------------------------------------------------------- -@interface CocoaAppDelegate : NSObject +@interface CocoaAppDelegate : NSObject { } From 41e9cd315762c7317493b841ff063c1706e2bfd4 Mon Sep 17 00:00:00 2001 From: Hartwig Date: Sun, 22 Oct 2017 15:04:33 +0200 Subject: [PATCH 2/3] Replacement of commas with semicolons --- include/osgDB/DataTypes | 2 +- include/osgUtil/RenderLeaf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/osgDB/DataTypes b/include/osgDB/DataTypes index 8d319e806..4b6a8bbca 100644 --- a/include/osgDB/DataTypes +++ b/include/osgDB/DataTypes @@ -134,7 +134,7 @@ public: : _name(copy._name), _indentDelta(copy._indentDelta) {} void set( const char* name, int delta=0 ) - { _name = name, _indentDelta = delta; } + { _name = name; _indentDelta = delta; } std::string _name; int _indentDelta; diff --git a/include/osgUtil/RenderLeaf b/include/osgUtil/RenderLeaf index b1d36fb03..6e699602a 100644 --- a/include/osgUtil/RenderLeaf +++ b/include/osgUtil/RenderLeaf @@ -52,8 +52,8 @@ class OSGUTIL_EXPORT RenderLeaf : public osg::Referenced { _parent = 0; _drawable = drawable; - _projection = projection, - _modelview = modelview, + _projection = projection; + _modelview = modelview; _depth = depth; _dynamic = (drawable->getDataVariance()==osg::Object::DYNAMIC); _traversalNumber = traversalNumber; From 2fc3387429338a0eab4ace4e0dfb927114806f55 Mon Sep 17 00:00:00 2001 From: Hartwig Date: Sun, 22 Oct 2017 22:13:46 +0200 Subject: [PATCH 3/3] BUG FIX - Addition of missing #endif directive --- src/osgViewer/GraphicsWindowCarbon.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/osgViewer/GraphicsWindowCarbon.cpp b/src/osgViewer/GraphicsWindowCarbon.cpp index 0fbb6f21c..18169b3f0 100644 --- a/src/osgViewer/GraphicsWindowCarbon.cpp +++ b/src/osgViewer/GraphicsWindowCarbon.cpp @@ -1100,3 +1100,6 @@ public: REGISTER_WINDOWINGSYSTEMINTERFACE(Carbon, CarbonWindowingSystemInterface) } + +#endif +