On 21 March 2017 at 09:23, Mark Johnson <mj10...@googlemail.com> wrote: >> Yet I still see lots of code in that PR like: >> >> if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= >> GDAL_COMPUTE_VERSION(2,0,0) >> >> That's what I'm referring to. All this conditional code needs removal >> (unless it's testing for something in GDAL > 2.0 ). > > > Mosty in the static functions > - QgsOgrProviderUtils, mostly with a switch > > and a few elsewhere. > > There are also few for much older versions > #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1400 > > They are easy to remove. > > There is one (at least) that must remain > > #if defined(GDAL_COMPUTE_VERSION) && GDAL_VERSION_NUM >= > GDAL_COMPUTE_VERSION(2,1,2) > > I count 20, beforehand there were many more. > > There also other classes sped around the project that uses OGR > - some of which also have these
Ok - I find this thread very confusing. Does this acknowledgement mean that you WILL remove these ifdefs from the PR? Here's the thing: I *want* your work to land in QGIS. It's important stuff, and needs to be addressed. But in its current form it won't be merged - it's been independently reviewed by two core developers who have both requested changes. I hate to see all this effort you've put in wasted, but you need to rework your approach before this can be merged. Nyall _______________________________________________ Qgis-developer mailing list Qgis-developer@lists.osgeo.org List info: https://lists.osgeo.org/mailman/listinfo/qgis-developer Unsubscribe: https://lists.osgeo.org/mailman/listinfo/qgis-developer
