forked from Lainports/freebsd-ports
a9fd01f491
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)
23 lines
818 B
C++
23 lines
818 B
C++
--- 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:
|