Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix build with sip 4.18.1 (eg. ubuntu artful)
  • Loading branch information
jef-n committed Jun 27, 2018
1 parent a652796 commit d0e9472
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion python/core/auto_generated/qgsvectordataprovider.sip.in 100755 → 100644
Expand Up @@ -131,7 +131,7 @@ Returns true if the layer contains at least one feature.
.. versionadded:: 3.4
%End

virtual QgsFeatureSource::FeatureAvailability hasFeatures() const final;
virtual QgsFeatureSource::FeatureAvailability hasFeatures() const;
%Docstring
Will always return FeatureAvailability.FeaturesAvailable or
FeatureAvailability.NoFeaturesAvailable.
Expand Down
1 change: 1 addition & 0 deletions scripts/sipify.pl
Expand Up @@ -958,6 +958,7 @@ sub detect_non_method_member{
do {no warnings 'uninitialized';
$LINE =~ s/^(\s*template\s*<)(?:class|typename) (\w+>)(.*)$/$1$2$3/;
$LINE =~ s/\s*\boverride\b//;
$LINE =~ s/\s*\bfinal\b//;
$LINE =~ s/\s*\bextern \b//;
$LINE =~ s/\s*\bMAYBE_UNUSED \b//;
$LINE =~ s/\s*\bNODISCARD \b//;
Expand Down

0 comments on commit d0e9472

Please sign in to comment.