svn commit: r538865 - head/math/saga/files

Piotr Kubaj pkubaj at FreeBSD.org
Mon Jun 15 09:16:50 UTC 2020


Author: pkubaj
Date: Mon Jun 15 09:16:49 2020
New Revision: 538865
URL: https://svnweb.freebsd.org/changeset/ports/538865

Log:
  math/saga: fix build on GCC architectures
  
  Returning NULL as bool is not ok.
  --- globe_gores.lo ---
  globe_gores.cpp: In member function 'bool CGlobe_Gores::Add_Gore(int, int)':
  globe_gores.cpp:210:16: error: converting to 'bool' from 'std::nullptr_t' requires direct-initialization [-fpermissive]
    210 |   return( NULL );
  
  PR:		246720
  Approved by:	rhurlin at gwdg.de (maintainer)

Added:
  head/math/saga/files/patch-src_tools_projection_pj__proj4_globe__gores.cpp   (contents, props changed)

Added: head/math/saga/files/patch-src_tools_projection_pj__proj4_globe__gores.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/saga/files/patch-src_tools_projection_pj__proj4_globe__gores.cpp	Mon Jun 15 09:16:49 2020	(r538865)
@@ -0,0 +1,11 @@
+--- src/tools/projection/pj_proj4/globe_gores.cpp.orig	2020-05-24 11:21:37 UTC
++++ src/tools/projection/pj_proj4/globe_gores.cpp
+@@ -207,7 +207,7 @@ bool CGlobe_Gores::Add_Gore(int iGore, int nGores)
+ 
+ 		SG_Get_Tool_Library_Manager().Delete_Tool(pTool);
+ 
+-		return( NULL );
++		return( false );
+ 	}
+ 
+ 	CSG_Grid	*pGore	= pTool->Get_Parameter("GRID")->asGrid();


More information about the svn-ports-all mailing list