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

cppcommon: add version 1.0.4.1 #23053

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
13 changes: 13 additions & 0 deletions recipes/cppcommon/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.0.4.1":
url: "https://github.com/chronoxor/CppCommon/archive/1.0.4.1.tar.gz"
sha256: "b4fd34cd1ef7fb0664321dde678ade2d00b29e299b457560799ea46b3c4a2524"
"1.0.4.0":
url: "https://github.com/chronoxor/CppCommon/archive/1.0.4.0.tar.gz"
sha256: "724865a64309ab24b3e10d29b04dfec821003013635eff84dd2108f98e7a6fc3"
Expand All @@ -18,6 +21,16 @@ sources:
url: "https://github.com/chronoxor/CppCommon/archive/cacfa9554d367467808663d9d5a695933ae566bb.tar.gz"
sha256: "d2e717798e1668c831ee977763eaff7413ef48e6e0914a6322c9918016092048"
patches:
"1.0.4.1":
- patch_file: "patches/0001-update-cmakelists-1-0-4-0.patch"
patch_description: "use cci packages"
patch_type: "conan"
- patch_file: "patches/0003-define-win32-winnt-1-0-4-0.patch"
patch_description: "define _WIN32_WINNT"
patch_type: "portability"
- patch_file: "patches/0006-add-initializer-1-0-4-1.patch"
patch_description: "add member variable initializer in constructor"
patch_type: "portability"
"1.0.4.0":
- patch_file: "patches/0001-update-cmakelists-1-0-4-0.patch"
patch_description: "use cci packages"
Expand Down
13 changes: 13 additions & 0 deletions recipes/cppcommon/all/patches/0006-add-initializer-1-0-4-1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/include/system/uuid.inl b/include/system/uuid.inl
index 9fc3c2a..08f6450 100644
--- a/include/system/uuid.inl
+++ b/include/system/uuid.inl
@@ -26,7 +26,7 @@ inline constexpr uint8_t unhex(char ch)
} // namespace Internals
//! @endcond

-inline constexpr UUID::UUID(const char* uuid, size_t size)
+inline constexpr UUID::UUID(const char* uuid, size_t size) : _data()
{
char v1 = 0;
char v2 = 0;
2 changes: 2 additions & 0 deletions recipes/cppcommon/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.0.4.1":
folder: all
"1.0.4.0":
folder: all
"1.0.3.0":
Expand Down
Loading