From f2bfbf8ce64ec3d34aa9ad369f9515be3b33ae59 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 22 Nov 2023 11:16:44 +0100 Subject: [PATCH 1/2] Identation change * ACE/ace/Future.cpp: --- ACE/ace/Future.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp index 311d9df096a60..0fe3d4a608b1f 100644 --- a/ACE/ace/Future.cpp +++ b/ACE/ace/Future.cpp @@ -245,7 +245,7 @@ ACE_Future_Rep::attach (ACE_Future_Observer *observer, if (this->value_ == 0) result = this->observer_collection_.insert (observer); else - observer->update (caller); + observer->update (caller); return result; } From f605c601d506dcffa828b10e28904ab0d7690825 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 22 Nov 2023 11:17:25 +0100 Subject: [PATCH 2/2] Upgrade to vcpkg 2023.11.20 * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8245444c68e46..5e758873af7bf 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -131,7 +131,7 @@ jobs: - name: Install vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 5b1214315250939257ef5d62ecdcbca18cf4fb1c + vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6 runVcpkgInstall: true - name: create $ACE_ROOT/ace/config.h run: |