epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

return StringArray instead of StringArray & for choices

Browse Source
This commit is contained in:
Marty Kraimer
2012-05-15 16:06:33 -04:00
parent ca195b44cf
commit 27ce426f46
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pvDataApp/property/pvEnumerated.cpp
View File

@@ -88,14 +88,13 @@ bool PVEnumerated::choicesMutable()
return pvChoices->isImmutable();
}
StringArray& PVEnumerated:: getChoices()
StringArray PVEnumerated:: getChoices()
{
if(pvIndex.get()==NULL ) {
throw std::logic_error(notAttached);
}
StringArrayData data;
pvChoices->get(0,pvChoices->getLength(),data);
printf("getChoices %p size %d\n",&data.data,data.data.size());
return data.data;
}

2
pvDataApp/property/pvEnumerated.h
View File

@@ -27,7 +27,7 @@ public:
int32 getIndex();
String getChoice();
bool choicesMutable();
StringArray & getChoices();
StringArray getChoices();
int32 getNumberChoices();
bool setChoices(StringArray & choices);
private:

7
testApp/property/testProperty.cpp
View File

@@ -214,13 +214,8 @@ static void testEnumerated(FILE * fd,FILE *auxfd)
assert(result);
int32 index = pvEnumerated.getIndex();
String choice = pvEnumerated.getChoice();
StringArray &choices = pvEnumerated.getChoices();
StringArray choices = pvEnumerated.getChoices();
int32 numChoices = pvEnumerated.getNumberChoices();
printf("%p size %d numChoices %d\n",&choices,choices.size(),numChoices);
for(int i=0; i<numChoices; i++ ) {
String xxx = choices[i];
printf("i %d %s\n",i,xxx.c_str());
}
fprintf(fd,"index %d choice %s choices",index,choice.c_str());
for(int i=0; i<numChoices; i++ ) fprintf(fd," %s",choices[i].c_str());
fprintf(fd,"\n");