-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
daggy: fix compilation error when YAML disabled
- Loading branch information
Showing
3 changed files
with
25 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,3 +5,12 @@ sources: | |
"2.1.2": | ||
url: "https://github.com/synacker/daggy/archive/refs/tags/2.1.2.tar.gz" | ||
sha256: "d3b244fcb06cf5b749d19ca9d678aebbaa43a7e8c8208d99c15a58e140e49493" | ||
patches: | ||
"2.1.3": | ||
- patch_file: "patches/001-fix-disabled-yaml.patch" | ||
patch_description: "Fix compilation error when YAML is disabled" | ||
patch_type: "bugfix" | ||
Check warning on line 12 in recipes/daggy/2.1/conandata.yml GitHub Actions / Lint changed files (YAML files)conandata.yml schema warning
|
||
"2.1.2": | ||
- patch_file: "patches/001-fix-disabled-yaml.patch" | ||
patch_description: "Fix compilation error when YAML is disabled" | ||
patch_type: "bugfix" | ||
Check warning on line 16 in recipes/daggy/2.1/conandata.yml GitHub Actions / Lint changed files (YAML files)conandata.yml schema warning
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- src/DaggyCore/Sources.cpp | ||
+++ src/DaggyCore/Sources.cpp | ||
@@ -371,7 +371,7 @@ | ||
} | ||
|
||
#else | ||
-std::optional<daggy::Sources> daggy::sources::convertors::yaml(const QString& data, QString& error) | ||
+std::optional<daggy::Sources> daggy::sources::convertors::yaml(const QString& data, QString& error) noexcept | ||
{ | ||
error = "yaml not supported"; | ||
return {}; |