[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55110] trunk/blender: code cleanup: 0 --> NULL
Prashant Sohani
prashant.sohani at gmail.com
Fri Mar 8 10:43:38 CET 2013
same here on Ubuntu
On 8 March 2013 14:12, Dalai Felinto <dfelinto at gmail.com> wrote:
> For OSX at least this is breaking building:
> //intern/ghost/intern/GHOST_Path-api.cpp:51:72: error: use of undeclared
> identifier 'NULL'
>
> --
> Dalai
>
> blendernetwork.org/member/dalai-felinto
> www.dalaifelinto.com
>
>
> 2013/3/7 Campbell Barton <ideasman42 at gmail.com>
>
> > Revision: 55110
> >
> >
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55110
> > Author: campbellbarton
> > Date: 2013-03-08 06:32:00 +0000 (Fri, 08 Mar 2013)
> > Log Message:
> > -----------
> > code cleanup: 0 --> NULL
> >
> > Modified Paths:
> > --------------
> > trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
> > trunk/blender/intern/ghost/GHOST_ISystem.h
> > trunk/blender/intern/ghost/intern/GHOST_Event.h
> > trunk/blender/intern/ghost/intern/GHOST_EventManager.cpp
> > trunk/blender/intern/ghost/intern/GHOST_EventManager.h
> > trunk/blender/intern/ghost/intern/GHOST_Path-api.cpp
> > trunk/blender/intern/ghost/intern/GHOST_System.cpp
> > trunk/blender/intern/ghost/intern/GHOST_System.h
> > trunk/blender/intern/ghost/intern/GHOST_TimerManager.cpp
> > trunk/blender/intern/ghost/intern/GHOST_TimerTask.h
> > trunk/blender/intern/memutil/MEM_Allocator.h
> > trunk/blender/intern/memutil/MEM_CacheLimiter.h
> > trunk/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
> > trunk/blender/intern/string/intern/STR_String.cpp
> > trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
> >
> > trunk/blender/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
> >
> > Modified: trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
> > ===================================================================
> > --- trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
> > 2013-03-08 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
> > 2013-03-08 06:32:00 UTC (rev 55110)
> > @@ -77,7 +77,7 @@
> > AUD_CallbackIIRFilterReader(boost::shared_ptr<AUD_IReader>
> reader,
> > int in, int out,
> >
> > doFilterIIR doFilter,
> >
> > endFilterIIR endFilter = 0,
> > - void*
> data
> > = 0);
> > + void*
> data
> > = NULL);
> >
> > virtual ~AUD_CallbackIIRFilterReader();
> >
> >
> > Modified: trunk/blender/intern/ghost/GHOST_ISystem.h
> > ===================================================================
> > --- trunk/blender/intern/ghost/GHOST_ISystem.h 2013-03-08 04:31:21 UTC
> > (rev 55109)
> > +++ trunk/blender/intern/ghost/GHOST_ISystem.h 2013-03-08 06:32:00 UTC
> > (rev 55110)
> > @@ -201,7 +201,7 @@
> > virtual GHOST_ITimerTask *installTimer(GHOST_TUns64 delay,
> > GHOST_TUns64 interval,
> > GHOST_TimerProcPtr
> > timerProc,
> > - GHOST_TUserDataPtr
> userData
> > = 0) = 0;
> > + GHOST_TUserDataPtr
> userData
> > = NULL) = 0;
> >
> > /**
> > * Removes a timer.
> >
> > Modified: trunk/blender/intern/ghost/intern/GHOST_Event.h
> > ===================================================================
> > --- trunk/blender/intern/ghost/intern/GHOST_Event.h 2013-03-08
> > 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/ghost/intern/GHOST_Event.h 2013-03-08
> > 06:32:00 UTC (rev 55110)
> > @@ -51,7 +51,7 @@
> > * \param window The generating window (or NULL if system event).
> > */
> > GHOST_Event(GHOST_TUns64 msec, GHOST_TEventType type,
> > GHOST_IWindow *window)
> > - : m_type(type), m_time(msec), m_window(window), m_data(0)
> > + : m_type(type), m_time(msec), m_window(window),
> > m_data(NULL)
> > {
> > }
> >
> >
> > Modified: trunk/blender/intern/ghost/intern/GHOST_EventManager.cpp
> > ===================================================================
> > --- trunk/blender/intern/ghost/intern/GHOST_EventManager.cpp
> 2013-03-08
> > 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/ghost/intern/GHOST_EventManager.cpp
> 2013-03-08
> > 06:32:00 UTC (rev 55110)
> > @@ -81,7 +81,7 @@
> >
> > GHOST_IEvent *GHOST_EventManager::peekEvent()
> > {
> > - GHOST_IEvent *event = 0;
> > + GHOST_IEvent *event = NULL;
> > if (m_events.empty() == false) {
> > event = m_events.back();
> > }
> >
> > Modified: trunk/blender/intern/ghost/intern/GHOST_EventManager.h
> > ===================================================================
> > --- trunk/blender/intern/ghost/intern/GHOST_EventManager.h
> 2013-03-08
> > 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/ghost/intern/GHOST_EventManager.h
> 2013-03-08
> > 06:32:00 UTC (rev 55110)
> > @@ -141,7 +141,7 @@
> > virtual void
> > removeTypeEvents(
> > GHOST_TEventType type,
> > - GHOST_IWindow *window = 0
> > + GHOST_IWindow *window = NULL
> > );
> >
> > protected:
> >
> > Modified: trunk/blender/intern/ghost/intern/GHOST_Path-api.cpp
> > ===================================================================
> > --- trunk/blender/intern/ghost/intern/GHOST_Path-api.cpp
> 2013-03-08
> > 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/ghost/intern/GHOST_Path-api.cpp
> 2013-03-08
> > 06:32:00 UTC (rev 55110)
> > @@ -48,19 +48,19 @@
> > const GHOST_TUns8 *GHOST_getSystemDir(int version, const char
> *versionstr)
> > {
> > GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
> > - return systemPaths ? systemPaths->getSystemDir(version,
> > versionstr) : 0;
> > + return systemPaths ? systemPaths->getSystemDir(version,
> > versionstr) : NULL;
> > }
> >
> > const GHOST_TUns8 *GHOST_getUserDir(int version, const char *versionstr)
> > {
> > GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
> > - return systemPaths ? systemPaths->getUserDir(version, versionstr)
> > : 0; /* shouldn't be NULL */
> > + return systemPaths ? systemPaths->getUserDir(version, versionstr)
> > : NULL; /* shouldn't be NULL */
> > }
> >
> > const GHOST_TUns8 *GHOST_getBinaryDir()
> > {
> > GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
> > - return systemPaths ? systemPaths->getBinaryDir() : 0; /*
> > shouldn't be NULL */
> > + return systemPaths ? systemPaths->getBinaryDir() : NULL; /*
> > shouldn't be NULL */
> > }
> >
> > void GHOST_addToSystemRecentFiles(const char *filename)
> >
> > Modified: trunk/blender/intern/ghost/intern/GHOST_System.cpp
> > ===================================================================
> > --- trunk/blender/intern/ghost/intern/GHOST_System.cpp 2013-03-08
> > 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/ghost/intern/GHOST_System.cpp 2013-03-08
> > 06:32:00 UTC (rev 55110)
> > @@ -46,10 +46,10 @@
> >
> > GHOST_System::GHOST_System()
> > : m_nativePixel(false),
> > - m_displayManager(0),
> > - m_timerManager(0),
> > - m_windowManager(0),
> > - m_eventManager(0)
> > + m_displayManager(NULL),
> > + m_timerManager(NULL),
> > + m_windowManager(NULL),
> > + m_eventManager(NULL)
> > #ifdef WITH_INPUT_NDOF
> > , m_ndofManager(0)
> > #endif
> > @@ -324,19 +324,19 @@
> > }
> > if (m_displayManager) {
> > delete m_displayManager;
> > - m_displayManager = 0;
> > + m_displayManager = NULL;
> > }
> > if (m_windowManager) {
> > delete m_windowManager;
> > - m_windowManager = 0;
> > + m_windowManager = NULL;
> > }
> > if (m_timerManager) {
> > delete m_timerManager;
> > - m_timerManager = 0;
> > + m_timerManager = NULL;
> > }
> > if (m_eventManager) {
> > delete m_eventManager;
> > - m_eventManager = 0;
> > + m_eventManager = NULL;
> > }
> > #ifdef WITH_INPUT_NDOF
> > if (m_ndofManager) {
> >
> > Modified: trunk/blender/intern/ghost/intern/GHOST_System.h
> > ===================================================================
> > --- trunk/blender/intern/ghost/intern/GHOST_System.h 2013-03-08
> > 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/ghost/intern/GHOST_System.h 2013-03-08
> > 06:32:00 UTC (rev 55110)
> > @@ -100,7 +100,7 @@
> > virtual GHOST_ITimerTask *installTimer(GHOST_TUns64 delay,
> > GHOST_TUns64 interval,
> > GHOST_TimerProcPtr
> > timerProc,
> > - GHOST_TUserDataPtr
> userData
> > = 0);
> > + GHOST_TUserDataPtr
> userData
> > = NULL);
> >
> > /**
> > * Removes a timer.
> >
> > Modified: trunk/blender/intern/ghost/intern/GHOST_TimerManager.cpp
> > ===================================================================
> > --- trunk/blender/intern/ghost/intern/GHOST_TimerManager.cpp
> 2013-03-08
> > 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/ghost/intern/GHOST_TimerManager.cpp
> 2013-03-08
> > 06:32:00 UTC (rev 55110)
> > @@ -90,7 +90,7 @@
> > // Remove the timer task
> > m_timers.erase(iter);
> > delete timer;
> > - timer = 0;
> > + timer = NULL;
> > success = GHOST_kSuccess;
> > }
> > else {
> >
> > Modified: trunk/blender/intern/ghost/intern/GHOST_TimerTask.h
> > ===================================================================
> > --- trunk/blender/intern/ghost/intern/GHOST_TimerTask.h 2013-03-08
> > 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/ghost/intern/GHOST_TimerTask.h 2013-03-08
> > 06:32:00 UTC (rev 55110)
> > @@ -54,7 +54,7 @@
> > GHOST_TimerTask(GHOST_TUns64 start,
> > GHOST_TUns64 interval,
> > GHOST_TimerProcPtr timerProc,
> > - GHOST_TUserDataPtr userData = 0)
> > + GHOST_TUserDataPtr userData = NULL)
> > : m_start(start),
> > m_interval(interval),
> > m_next(start),
> >
> > Modified: trunk/blender/intern/memutil/MEM_Allocator.h
> > ===================================================================
> > --- trunk/blender/intern/memutil/MEM_Allocator.h 2013-03-08
> > 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/memutil/MEM_Allocator.h 2013-03-08
> > 06:32:00 UTC (rev 55110)
> > @@ -63,7 +63,7 @@
> > // NB: __n is permitted to be 0. The C++ standard says nothing
> > // about what the return value is when __n == 0.
> > _Tp* allocate(size_type __n, const void* = 0) {
> > - _Tp* __ret = 0;
> > + _Tp* __ret = NULL;
> > if (__n)
> > __ret = static_cast<_Tp*>(
> > MEM_mallocN(__n * sizeof(_Tp),
> >
> > Modified: trunk/blender/intern/memutil/MEM_CacheLimiter.h
> > ===================================================================
> > --- trunk/blender/intern/memutil/MEM_CacheLimiter.h 2013-03-08
> > 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/memutil/MEM_CacheLimiter.h 2013-03-08
> > 06:32:00 UTC (rev 55110)
> > @@ -108,7 +108,7 @@
> > bool destroy_if_possible() {
> > if (can_destroy()) {
> > delete data;
> > - data = 0;
> > + data = NULL;
> > unmanage();
> > return true;
> > }
> >
> > Modified: trunk/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
> > ===================================================================
> > --- trunk/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
> > 2013-03-08 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
> > 2013-03-08 06:32:00 UTC (rev 55110)
> > @@ -128,7 +128,7 @@
> > {
> > // should not happen, but don't leak memory in this case...
> > for (list_t::iterator it = cclass_list.begin(); it !=
> > cclass_list.end(); it++) {
> > - (*it)->set_data(0);
> > + (*it)->set_data(NULL);
> >
> > delete *it;
> > }
> >
> > Modified: trunk/blender/intern/string/intern/STR_String.cpp
> > ===================================================================
> > --- trunk/blender/intern/string/intern/STR_String.cpp 2013-03-08
> > 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/intern/string/intern/STR_String.cpp 2013-03-08
> > 06:32:00 UTC (rev 55110)
> > @@ -106,7 +106,7 @@
> > this->m_data[this->m_len] = 0;
> > }
> > else {
> > - this->m_data = 0;
> > + this->m_data = NULL;
> > this->m_len = 0;
> > this->m_max = 8;
> > }
> >
> > Modified:
> trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
> > ===================================================================
> > --- trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
> > 2013-03-08 04:31:21 UTC (rev 55109)
> > +++ trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
> > 2013-03-08 06:32:00 UTC (rev 55110)
> > @@ -87,7 +87,7 @@
> >
> > RayObject *RE_rayface_from_vlak(RayFace *rayface, ObjectInstanceRen
> *obi,
> > VlakRen *vlr)
> > {
> > - return rayface_from_coords(rayface, obi, vlr, vlr->v1->co,
> > vlr->v2->co, vlr->v3->co, vlr->v4 ? vlr->v4->co : 0);
> > + return rayface_from_coords(rayface, obi, vlr, vlr->v1->co,
> > vlr->v2->co, vlr->v3->co, vlr->v4 ? vlr->v4->co : NULL);
> > }
> >
> > RayObject *RE_rayface_from_coords(RayFace *rayface, void *ob, void
> *face,
> > float *v1, float *v2, float *v3, float *v4)
> >
> > Modified:
> > trunk/blender/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
> > ===================================================================
> > ---
> > trunk/blender/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
> > 2013-03-08 04:31:21 UTC (rev 55109)
> >
> > @@ Diff output truncated at 10240 characters. @@
> > _______________________________________________
> > Bf-blender-cvs mailing list
> > Bf-blender-cvs at blender.org
> > http://lists.blender.org/mailman/listinfo/bf-blender-cvs
> >
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
>
More information about the Bf-committers
mailing list