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

[zeroc-ice] Fix error C2039: 'binary_function': is not a member of 'std' #33333

Merged
merged 1 commit into from
Aug 24, 2023
Merged

[zeroc-ice] Fix error C2039: 'binary_function': is not a member of 'std' #33333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions ports/zeroc-ice/fix-missing-functional.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h
index 177a7f8..19b8c09 100644
--- a/cpp/include/IceUtil/Timer.h
+++ b/cpp/include/IceUtil/Timer.h
@@ -12,6 +12,7 @@

#include <set>
#include <map>
+#include <functional>

namespace IceUtil
{
5 changes: 4 additions & 1 deletion ports/zeroc-ice/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ vcpkg_from_github(
REPO zeroc-ice/ice
REF "v${VERSION}"
SHA512 07d7c439fbe1f69d808d05a11f32e09cdd8d4df2a93b6f253496304e0a521d417212ae688e316b4450dae406b59d1a460025b51ecd0614c69e48d86c0a6f81c5
PATCHES mcppd_fix.patch no-werror.patch
PATCHES
mcppd_fix.patch
no-werror.patch
fix-missing-functional.patch
)

set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel)
Expand Down
2 changes: 1 addition & 1 deletion ports/zeroc-ice/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "zeroc-ice",
"version": "3.7.9",
"port-version": 1,
"port-version": 2,
"maintainers": "Benjamin Oldenburg <[email protected]>",
"description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.",
"homepage": "https://github.com/zeroc-ice/ice",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9038,7 +9038,7 @@
},
"zeroc-ice": {
"baseline": "3.7.9",
"port-version": 1
"port-version": 2
},
"zeromq": {
"baseline": "2023-06-20",
Expand Down
5 changes: 5 additions & 0 deletions versions/z-/zeroc-ice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dc07eee81cdf5c66efc83d606c635e722ef23d39",
"version": "3.7.9",
"port-version": 2
},
{
"git-tree": "bb449d6446b3700170a831c0b155d58be3613a26",
"version": "3.7.9",
Expand Down