Merge pull request #371 from hwiesmann/master
Removal of compiler warning for Cocoa builds
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1100,3 +1100,6 @@ public:
|
||||
REGISTER_WINDOWINGSYSTEMINTERFACE(Carbon, CarbonWindowingSystemInterface)
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -199,7 +199,7 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
// the app-delegate, handling quit-requests
|
||||
// ----------------------------------------------------------------------------------------------------------
|
||||
|
||||
@interface CocoaAppDelegate : NSObject
|
||||
@interface CocoaAppDelegate : NSObject <NSApplicationDelegate>
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user