Commit 7235a62e authored by Guillaume Pasero's avatar Guillaume Pasero

Merge branch 'fix_gdal_2.3.0' into 'release-6.6'

BUG: #1567: fix compilation with GDAL 2.3.0

See merge request !79
parents b963a177 d612e33c
......@@ -114,7 +114,11 @@ typedef mpl::map
*/
template
< typename T
#if GDAL_VERSION_NUM >= 2030000
, T ( OGRFeature::*ptr_to_function )(int) const
#else
, T ( OGRFeature::*ptr_to_function )(int)
#endif
, typename FinalReturnType = T
> class MemberGetterPtr
{
......@@ -190,7 +194,11 @@ template
*/
template
< typename T
#if GDAL_VERSION_NUM >= 2030000
, T const* ( OGRFeature::*ptr_to_function )(int, int*) const
#else
, T const* ( OGRFeature::*ptr_to_function )(int, int*)
#endif
, typename FinalReturnType = std::vector<T>
> class MemberContainerGetterPtr
{
......@@ -292,7 +300,11 @@ template
*/
template
< typename T
#if GDAL_VERSION_NUM >= 2030000
, void ( OGRFeature::*ptr_to_function )(int, int, const T*)
#else
, void ( OGRFeature::*ptr_to_function )(int, int, T*) // not const-correct
#endif
, typename ActualParamType = std::vector<T>
> class MemberContainerSetterPtr
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment