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

Merge pull request #1025 from glebm/fix-travis

Browse Source 
include/osg/Callback: nullptr -> NULL
This commit is contained in:
Robert Osfield 2021-01-18 14:15:51 +00:00 committed by GitHub
commit eb09720c1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/Callback
View File

@ -126,7 +126,7 @@ class OSG_EXPORT Callback : public virtual Object {
static T* findNestedCallback(osg::Callback* callback)
{
if (!callback)
return nullptr;
return NULL;
if (T* cb = dynamic_cast<T*>(callback))
return cb;
@ -139,7 +139,7 @@ class OSG_EXPORT Callback : public virtual Object {
static const T* findNestedCallback(const osg::Callback* callback)
{
if (!callback)
return nullptr;
return NULL;
if (const T* cb = dynamic_cast<const T*>(callback))
return cb;