diff options
| author | Michael Gmelin <grembo@FreeBSD.org> | 2014-09-12 18:06:17 +0000 |
|---|---|---|
| committer | Michael Gmelin <grembo@FreeBSD.org> | 2014-09-12 18:06:17 +0000 |
| commit | a9fd01f49122b5d4b1840c4b726bf06b1c510dc9 (patch) | |
| tree | b35a1987e6cdd0a6b55ffc4ed9b24499882cab9b /devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.h | |
| parent | 7bc80d6ec0100ab85b75ca5ca79d070446bea80b (diff) | |
| download | ports-a9fd01f49122b5d4b1840c4b726bf06b1c510dc9.tar.gz ports-a9fd01f49122b5d4b1840c4b726bf06b1c510dc9.zip | |
This adds patches No 3 [1] and No 5 [2] from upstream.
Also fixes LIB_DEPENDS handling (previous versions of the slave
ports won't depend on libIce.so), move LIB_DEPENDS and LIB_VRS
for slaves to master, upgrade to USES= python
[1] http://www.zeroc.com/forums/patches/6183-patch-3-ice-3-5-1-marshaling-bug-nested-optionals.html
[2] http://www.zeroc.com/forums/patches/6285-patch-5-ice-3-5-1-fix-icegrid-registry-issue-shared-replica-groups.html
Approved by: mentors (implicit)
Notes
Notes:
svn path=/head/; revision=368054
Diffstat (limited to 'devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.h')
| -rw-r--r-- | devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.h b/devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.h new file mode 100644 index 000000000000..1892a09f4682 --- /dev/null +++ b/devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.h @@ -0,0 +1,23 @@ +--- cpp/src/IceGrid/AdapterCache.h.orig 2013-03-11 15:19:47.000000000 +0000 ++++ cpp/src/IceGrid/AdapterCache.h 2014-09-08 14:21:13.335195726 +0000 +@@ -62,7 +62,7 @@ protected: + + AdapterCache& _cache; + const std::string _id; +- const std::string _application; ++ std::string _application; + }; + typedef IceUtil::Handle<AdapterEntry> AdapterEntryPtr; + +@@ -105,9 +105,9 @@ public: + virtual AdapterPrx getProxy(const std::string&, bool) const { return 0; } + + void addReplica(const std::string&, const ServerAdapterEntryPtr&); +- void removeReplica(const std::string&); ++ bool removeReplica(const std::string&); + +- void update(const LoadBalancingPolicyPtr&); ++ void update(const std::string&, const LoadBalancingPolicyPtr&); + bool hasAdaptersFromOtherApplications() const; + + private: |