Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove register keyword as not cpp17 complient #5835

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions recipes/gperf/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ sources:
"3.1":
url: "https://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz"
sha256: "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2"
patches:
"3.1":
- patch_file: "all/0001-assert-exception-upstream-issue-2011.patch"
base_path: "source_subfolder"
1 change: 1 addition & 0 deletions recipes/gperf/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class GperfConan(ConanFile):
settings = "os", "arch", "compiler"
_source_subfolder = "source_subfolder"
_autotools = None
exports_sources = "patches/**"

@property
def _is_msvc(self):
Expand Down
13 changes: 13 additions & 0 deletions recipes/gperf/all/patches/0001-remove-register-keyword.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/lib/getline.cc b/lib/getline.cc
index ecc3e85..2d97644 100644 (file)
--- a/lib/getline.cc
+++ b/lib/getline.cc
@@ -55,7 +55,7 @@ getstr (char **lineptr, size_t *n, FILE *stream, char terminator, size_t offset)

for (;;)
{
- register int c = getc (stream);
+ int c = getc (stream);

/* We always want at least one char left in the buffer, since we
always (unless we get an error while reading the first char)