summaryrefslogtreecommitdiff
path: root/cpp/demo/Glacier2/chat/ChatSessionI.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2009-09-09 15:46:16 -0230
committerMatthew Newhook <matthew@zeroc.com>2009-09-09 15:46:16 -0230
commitd25c2d8f8156b33c78b797cd4aa4823d3ade02cc (patch)
tree65b79d47f8a470ee9d6218687a124444234c0cbf /cpp/demo/Glacier2/chat/ChatSessionI.cpp
parentRemoved bogus file. (diff)
downloadice-d25c2d8f8156b33c78b797cd4aa4823d3ade02cc.tar.bz2
ice-d25c2d8f8156b33c78b797cd4aa4823d3ade02cc.tar.xz
ice-d25c2d8f8156b33c78b797cd4aa4823d3ade02cc.zip
- cpp/demo/Ice/session now uses a timer for the periodic reaping.
- cpp/demo/Glacier2/chat now uses a custom permissions verifier, and a timer for refresh of the Glacier2 session. Squashed commit of the following: commit 82732512d64b4b6782b9c96e9c558ad56ea232af Author: Matthew Newhook <matthew@zeroc.com> Date: Wed Sep 9 15:35:47 2009 -0230 Simplify session demo. commit 07cf68b9d12e8d648980d4bcae354e7531411b47 Author: Matthew Newhook <matthew@zeroc.com> Date: Wed Sep 9 14:59:15 2009 -0230 chat demo now uses a custom perissions verifier, and a timer task.
Diffstat (limited to 'cpp/demo/Glacier2/chat/ChatSessionI.cpp')
-rw-r--r--cpp/demo/Glacier2/chat/ChatSessionI.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/demo/Glacier2/chat/ChatSessionI.cpp b/cpp/demo/Glacier2/chat/ChatSessionI.cpp
index 887f3061589..8b30694c005 100644
--- a/cpp/demo/Glacier2/chat/ChatSessionI.cpp
+++ b/cpp/demo/Glacier2/chat/ChatSessionI.cpp
@@ -35,12 +35,12 @@ private:
static ChatRoomPtr _instance;
};
-ChatRoomPtr ChatRoom::_instance;
-IceUtil::Mutex* ChatRoom::_instanceMutex = 0;
-
namespace
{
+ChatRoomPtr ChatRoom::_instance;
+IceUtil::Mutex* ChatRoom::_instanceMutex = 0;
+
class Init
{
public:
@@ -126,7 +126,7 @@ ChatSessionI::ChatSessionI(const string& userId) :
}
void
-ChatSessionI::setCallback(const ChatCallbackPrx& callback, const Ice::Current& current)
+ChatSessionI::setCallback(const ChatCallbackPrx& callback, const Ice::Current&)
{
Lock sync(*this);
if(!_callback)