Date: Wed, 2 May 2018 23:33:20 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468893 - head/math/saga/files Message-ID: <201805022333.w42NXKsl061151@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed May 2 23:33:19 2018 New Revision: 468893 URL: https://svnweb.freebsd.org/changeset/ports/468893 Log: math/saga: unbreak build with wxWidgets 3.0.3 (try#2) grid_to_kml.cpp: In member function 'bool CGrid_from_KML::Load_Overlay(const wchar_t*, const CSG_MetaData&)': grid_to_kml.cpp:585:49: error: conversion from 'const wxScopedWCharBuffer {aka const wxScopedCharTypeBuffer<wchar_t>}' to non-scalar type 'CSG_String' requested CSG_String FullPath = fn.GetFullPath().wc_str(); ~~~~~~~~~~~~~~~~~~~~~~~^~ PR: 223758 Submitted by: rozhuk.im@gmail.com Approved by: Rainer Hurling (maintainer) Added: head/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp (contents, props changed) Added: head/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp Wed May 2 23:33:19 2018 (r468893) @@ -0,0 +1,16 @@ +grid_to_kml.cpp: In member function 'bool CGrid_from_KML::Load_Overlay(const wchar_t*, const CSG_MetaData&)': +grid_to_kml.cpp:585:49: error: conversion from 'const wxScopedWCharBuffer {aka const wxScopedCharTypeBuffer<wchar_t>}' to non-scalar type 'CSG_String' requested + CSG_String FullPath = fn.GetFullPath().wc_str(); + ~~~~~~~~~~~~~~~~~~~~~~~^~ + +--- src/tools/io/io_grid_image/grid_to_kml.cpp.orig 2017-06-21 13:50:57 UTC ++++ src/tools/io/io_grid_image/grid_to_kml.cpp +@@ -582,7 +582,7 @@ bool CGrid_from_KML::Load_Overlay(const SG_Char *Dir, + } + + CSG_Data_Manager Data; +- CSG_String FullPath = fn.GetFullPath().wc_str(); ++ CSG_String FullPath = static_cast<const wchar_t*>(fn.GetFullPath().wc_str()); + + if( !Data.Add(FullPath) || !Data.Get_Grid_System(0) || !Data.Get_Grid_System(0)->Get(0) ) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805022333.w42NXKsl061151>