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.

Sign up for GitHub

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

Upgrade to vcpkg 2023.11.20 #2165

Merged
merged 2 commits into from
Nov 22, 2023
Merged

Upgrade to vcpkg 2023.11.20 #2165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2bfbf8
Identation change
jwillemsen Nov 22, 2023
f605c60
Upgrade to vcpkg 2023.11.20
jwillemsen Nov 22, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion ACE/ace/Future.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ ACE_Future_Rep<T>::attach (ACE_Future_Observer<T> *observer,
if (this->value_ == 0)
result = this->observer_collection_.insert (observer);
else
observer->update (caller);
observer->update (caller);

return result;
}
Expand Down