summaryrefslogtreecommitdiff
path: root/cpp/src/IceStorm/TopicI.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-10-23 16:19:38 -0400
committerBernard Normier <bernard@zeroc.com>2012-10-23 16:19:38 -0400
commitada25bad3511a359eb28cf48f018d6a42e166f10 (patch)
tree430749f887a1c6f708c2d4a23b3e3ec4ef18ef2c /cpp/src/IceStorm/TopicI.cpp
parentRuby 1.8 fix (diff)
downloadice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.bz2
ice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.xz
ice-ada25bad3511a359eb28cf48f018d6a42e166f10.zip
Fixed ICE-4855: expand tabs to space (8) for .php, .cpp, .h, .java and .cs files
Diffstat (limited to 'cpp/src/IceStorm/TopicI.cpp')
-rw-r--r--cpp/src/IceStorm/TopicI.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index 7f1ea6b67b9..460e291c0ef 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -670,7 +670,7 @@ TopicImpl::subscribe(const QoS& origQoS, const Ice::ObjectPrx& obj)
catch(const DatabaseException& ex)
{
halt(_instance->communicator(), ex);
- }
+ }
}
Ice::IdentitySeq ids;
ids.push_back(id);
@@ -708,7 +708,7 @@ TopicImpl::subscribe(const QoS& origQoS, const Ice::ObjectPrx& obj)
catch(const DatabaseException& ex)
{
halt(_instance->communicator(), ex);
- }
+ }
}
_subscribers.push_back(subscriber);
@@ -792,7 +792,7 @@ TopicImpl::subscribeAndGetPublisher(const QoS& qos, const Ice::ObjectPrx& obj)
catch(const DatabaseException& ex)
{
halt(_instance->communicator(), ex);
- }
+ }
}
_subscribers.push_back(subscriber);
@@ -916,7 +916,7 @@ TopicImpl::link(const TopicPrx& topic, Ice::Int cost)
catch(const DatabaseException& ex)
{
halt(_instance->communicator(), ex);
- }
+ }
}
_subscribers.push_back(subscriber);
@@ -995,7 +995,7 @@ TopicImpl::shutdown()
// Shutdown each subscriber. This waits for the event queues to drain.
for(vector<SubscriberPtr>::const_iterator p = _subscribers.begin(); p != _subscribers.end(); ++p)
{
- (*p)->shutdown();
+ (*p)->shutdown();
}
_observer.detach();
@@ -1326,7 +1326,7 @@ TopicImpl::observerAddSubscriber(const LogUpdate& llu, const SubscriberRecord& r
catch(const DatabaseException& ex)
{
halt(_instance->communicator(), ex);
- }
+ }
}
_subscribers.push_back(subscriber);
@@ -1397,7 +1397,7 @@ TopicImpl::observerRemoveSubscriber(const LogUpdate& llu, const Ice::IdentitySeq
catch(const DatabaseException& ex)
{
halt(_instance->communicator(), ex);
- }
+ }
}
}
@@ -1444,7 +1444,7 @@ TopicImpl::updateSubscriberObservers()
IceUtil::Mutex::Lock sync(_subscribersMutex);
for(vector<SubscriberPtr>::const_iterator p = _subscribers.begin(); p != _subscribers.end(); ++p)
{
- (*p)->updateObserver();
+ (*p)->updateObserver();
}
}
@@ -1497,7 +1497,7 @@ TopicImpl::destroyInternal(const LogUpdate& origLLU, bool master)
catch(const DatabaseException& ex)
{
halt(_instance->communicator(), ex);
- }
+ }
}
_instance->topicAdapter()->remove(_id);
@@ -1570,7 +1570,7 @@ TopicImpl::removeSubscribers(const Ice::IdentitySeq& ids)
catch(const DatabaseException& ex)
{
halt(_instance->communicator(), ex);
- }
+ }
}
_instance->observers()->removeSubscriber(llu, _name, ids);