cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build of math/vtk6 with Clang6 on -CURRENT.

Browse Source 
The definition of NULL has changed in C++, and conversions have
gotten stricter, so using NULL where you mean 0 (or false) is
no longer an option. Detected by fallout from updating CMake 3.12.

No PORTREVISION bump because everywhere where it compiled previously
sees no change, and where it didn't compile before it does now
with the same result.

Reported by:	tcberner
This commit is contained in:
Adriaan de Groot 2018-06-20 09:27:51 +00:00
parent 88c6d799ff
commit 661683b9cf
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=472860
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
math/vtk6/files/patch-Rendering_OpenGL_vtkXOpenGLRenderWindow.cxx Normal file
View File

@ -0,0 +1,40 @@
--- Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx.orig 2015-03-03 20:37:14 UTC
+++ Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
@@ -386,7 +386,7 @@ XVisualInfo *vtkXOpenGLRenderWindow::Get
vtkXOpenGLRenderWindow::vtkXOpenGLRenderWindow()
{
- this->ParentId = static_cast<Window>(NULL);
+ this->ParentId = static_cast<Window>(0);
this->ScreenSize[0] = 0;
this->ScreenSize[1] = 0;
this->OwnDisplay = 0;
@@ -394,8 +394,8 @@ vtkXOpenGLRenderWindow::vtkXOpenGLRender
this->ForceMakeCurrent = 0;
this->UsingHardware = 0;
this->DisplayId = static_cast<Display *>(NULL);
- this->WindowId = static_cast<Window>(NULL);
- this->NextWindowId = static_cast<Window>(NULL);
+ this->WindowId = static_cast<Window>(0);
+ this->NextWindowId = static_cast<Window>(0);
this->ColorMap = static_cast<Colormap>(0);
this->OwnWindow = 0;
@@ -776,7 +776,7 @@ void vtkXOpenGLRenderWindow::DestroyWind
if (this->OwnWindow && this->DisplayId && this->WindowId)
{
XDestroyWindow(this->DisplayId,this->WindowId);
- this->WindowId = static_cast<Window>(NULL);
+ this->WindowId = static_cast<Window>(0);
}
// if we create the display, we'll delete it
@@ -1168,7 +1168,7 @@ void vtkXOpenGLRenderWindow::WindowRemap
// set the default windowid
this->WindowId = this->NextWindowId;
- this->NextWindowId = static_cast<Window>(NULL);
+ this->NextWindowId = static_cast<Window>(0);
// set everything up again
this->Initialize();