summaryrefslogtreecommitdiff
path: root/cpp/src/Freeze/ObjectStore.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/Freeze/ObjectStore.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/Freeze/ObjectStore.cpp')
-rw-r--r--cpp/src/Freeze/ObjectStore.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/cpp/src/Freeze/ObjectStore.cpp b/cpp/src/Freeze/ObjectStore.cpp
index e8801a1b3c7..44a9fb2b02f 100644
--- a/cpp/src/Freeze/ObjectStore.cpp
+++ b/cpp/src/Freeze/ObjectStore.cpp
@@ -62,13 +62,13 @@ Freeze::ObjectStoreBase::ObjectStoreBase(const string& facet, const string& face
if(p != catalog.end())
{
if(p->second.evictor)
- {
- //
- // empty means the value is ::Freeze::ObjectRecord
- //
- _keepStats = p->second.value.empty();
- }
- else
+ {
+ //
+ // empty means the value is ::Freeze::ObjectRecord
+ //
+ _keepStats = p->second.value.empty();
+ }
+ else
{
DatabaseException ex(__FILE__, __LINE__);
ex.message = evictor->filename() + " is not an evictor database";
@@ -149,8 +149,8 @@ Freeze::ObjectStoreBase::ObjectStoreBase(const string& facet, const string& face
{
CatalogData catalogData;
catalogData.evictor = true;
- catalogData.key = "Ice::Identity";
- catalogData.value = "Object";
+ catalogData.key = "Ice::Identity";
+ catalogData.value = "Object";
catalog.put(Catalog::value_type(evictor->filename(), catalogData));
}
@@ -214,8 +214,8 @@ Freeze::ObjectStoreBase::~ObjectStoreBase()
}
catch(const DbException& dx)
{
- Ice::Error error(_communicator->getLogger());
- error << "Freeze: closing ObjectStore " << _dbName << " raised DbException: " << dx.what();
+ Ice::Error error(_communicator->getLogger());
+ error << "Freeze: closing ObjectStore " << _dbName << " raised DbException: " << dx.what();
}
}
@@ -358,7 +358,7 @@ Freeze::ObjectStoreBase::marshal(const ObjectRecord& v,
Value& bytes,
const CommunicatorPtr& communicator,
const EncodingVersion& encoding,
- bool keepStats)
+ bool keepStats)
{
IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);
IceInternal::BasicStream stream(instance.get(), encoding, true);
@@ -369,7 +369,7 @@ Freeze::ObjectStoreBase::marshal(const ObjectRecord& v,
}
else
{
- stream.write(v.servant);
+ stream.write(v.servant);
}
stream.writePendingObjects();
@@ -382,7 +382,7 @@ Freeze::ObjectStoreBase::unmarshal(ObjectRecord& v,
const Value& bytes,
const CommunicatorPtr& communicator,
const EncodingVersion& encoding,
- bool keepStats)
+ bool keepStats)
{
IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);
IceInternal::BasicStream stream(instance.get(), encoding, true);
@@ -398,7 +398,7 @@ Freeze::ObjectStoreBase::unmarshal(ObjectRecord& v,
}
else
{
- stream.read(v.servant);
+ stream.read(v.servant);
}
stream.readPendingObjects();