interim commit
This commit is contained in:
@@ -63,7 +63,6 @@ ExampleCounter::ExampleCounter(
|
||||
|
||||
ExampleCounter::~ExampleCounter()
|
||||
{
|
||||
destroy();
|
||||
}
|
||||
|
||||
void ExampleCounter::destroy()
|
||||
|
||||
@@ -70,7 +70,6 @@ PowerSupplyRecordTest::PowerSupplyRecordTest(
|
||||
|
||||
PowerSupplyRecordTest::~PowerSupplyRecordTest()
|
||||
{
|
||||
destroy();
|
||||
}
|
||||
|
||||
void PowerSupplyRecordTest::destroy()
|
||||
|
||||
@@ -38,7 +38,6 @@ PVDatabase::PVDatabase()
|
||||
|
||||
PVDatabase::~PVDatabase()
|
||||
{
|
||||
destroy();
|
||||
}
|
||||
|
||||
void PVDatabase::destroy()
|
||||
|
||||
@@ -86,7 +86,15 @@ void PVRecord::destroy()
|
||||
(*clientIter)->detach(getPtrSelf());
|
||||
lock();
|
||||
}
|
||||
pvListenerList.clear();
|
||||
std::list<PVListenerPtr>::iterator listenerIter;
|
||||
while(true) {
|
||||
listenerIter = pvListenerList.begin();
|
||||
if(listenerIter==pvListenerList.end()) break;
|
||||
pvListenerList.erase(listenerIter);
|
||||
unlock();
|
||||
(*listenerIter)->unlisten(getPtrSelf());
|
||||
lock();
|
||||
}
|
||||
pvRecordStructure->destroy();
|
||||
pvRecordStructure.reset();
|
||||
convert.reset();
|
||||
@@ -491,6 +499,7 @@ void PVRecordStructure::destroy()
|
||||
for(iter = pvRecordFields->begin() ; iter !=pvRecordFields->end(); iter++) {
|
||||
(*iter)->destroy();
|
||||
}
|
||||
PVRecordField::destroy();
|
||||
pvRecordFields.reset();
|
||||
pvStructure.reset();
|
||||
}
|
||||
|
||||
@@ -59,7 +59,6 @@ RecordListRecord::RecordListRecord(
|
||||
|
||||
RecordListRecord::~RecordListRecord()
|
||||
{
|
||||
destroy();
|
||||
}
|
||||
|
||||
void RecordListRecord::destroy()
|
||||
@@ -92,9 +91,7 @@ bool RecordListRecord::init()
|
||||
void RecordListRecord::process()
|
||||
{
|
||||
PVStringArrayPtr pvNames = PVDatabase::getMaster()->getRecordNames();
|
||||
std::vector<String> const & xxx = pvNames->getVector();
|
||||
size_t n = xxx.size();
|
||||
names->put(0,n,xxx,0);
|
||||
names->replace(pvNames->viewUnsafe());
|
||||
String message("");
|
||||
if(database->get().compare("master")!=0) {
|
||||
message += " can only access master ";
|
||||
|
||||
Reference in New Issue
Block a user