collapse if statement in datastore

This commit is contained in:
Dennis Luxen 2014-07-02 11:18:45 +02:00
parent 3568dc2083
commit 36c0edea2a

View File

@ -63,33 +63,30 @@ typedef StaticGraph<QueryEdge::EdgeData> QueryGraph;
// delete a shared memory region. report warning if it could not be deleted // delete a shared memory region. report warning if it could not be deleted
void delete_region(const SharedDataType region) void delete_region(const SharedDataType region)
{ {
if (SharedMemory::RegionExists(region)) if (SharedMemory::RegionExists(region) && !SharedMemory::Remove(region))
{ {
if (!SharedMemory::Remove(region)) const std::string name = [&]
{ {
const std::string name = [&] switch (region)
{ {
switch (region) case CURRENT_REGIONS:
{ return "CURRENT_REGIONS";
case CURRENT_REGIONS: case LAYOUT_1:
return "CURRENT_REGIONS"; return "LAYOUT_1";
case LAYOUT_1: case DATA_1:
return "LAYOUT_1"; return "DATA_1";
case DATA_1: case LAYOUT_2:
return "DATA_1"; return "LAYOUT_2";
case LAYOUT_2: case DATA_2:
return "LAYOUT_2"; return "DATA_2";
case DATA_2: case LAYOUT_NONE:
return "DATA_2"; return "LAYOUT_NONE";
case LAYOUT_NONE: default: // DATA_NONE:
return "LAYOUT_NONE"; return "DATA_NONE";
default: // DATA_NONE: }
return "DATA_NONE"; }();
}
}();
SimpleLogger().Write(logWARNING) << "could not delete shared memory region " << name; SimpleLogger().Write(logWARNING) << "could not delete shared memory region " << name;
}
} }
} }