summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/AdapterCache.h
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/AdapterCache.h')
-rw-r--r--cpp/src/IceGrid/AdapterCache.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h
index 8a70c23ddca..be7203955de 100644
--- a/cpp/src/IceGrid/AdapterCache.h
+++ b/cpp/src/IceGrid/AdapterCache.h
@@ -29,11 +29,11 @@ typedef std::vector<ServerEntryPtr> ServerEntrySeq;
class AdapterEntry;
typedef IceUtil::Handle<AdapterEntry> AdapterEntryPtr;
-class AdapterEntry : public Allocatable, public IceUtil::Mutex
+class AdapterEntry : virtual public IceUtil::Shared, public IceUtil::Mutex
{
public:
- AdapterEntry(AdapterCache&, const std::string&, bool, const AllocatablePtr&);
+ AdapterEntry(AdapterCache&, const std::string&);
virtual std::vector<std::pair<std::string, AdapterPrx> > getProxies(int&, const SessionIPtr&) = 0;
virtual float getLeastLoadedNodeLoad(LoadSample) const = 0;
@@ -49,7 +49,7 @@ protected:
};
typedef IceUtil::Handle<AdapterEntry> AdapterEntryPtr;
-class ServerAdapterEntry : public AdapterEntry
+class ServerAdapterEntry : public AdapterEntry, public Allocatable
{
public:
@@ -63,7 +63,7 @@ public:
AdapterPrx getProxy(const std::string& = std::string()) const;
- virtual void allocated(const SessionIPtr&);
+ virtual bool allocated(const SessionIPtr&);
virtual void released(const SessionIPtr&);
private: