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

c++11 compilation (take 3)

Browse Source 
references #28
This commit is contained in:
Matej Sekoranja
2016-03-23 22:22:22 +01:00
parent 616e894669
commit d54ddff9ae
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pvtoolsSrc/eget.cpp
View File

@@ -890,7 +890,7 @@ void dumpValue(std::string const & channelName, PVField::shared_pointer const &
pvutil_ostream myos(std::cout.rdbuf());
if (pv->getField()->getType() == structure)
myos << *(static_pointer_cast<PVStructure>(pv).get()) << std::endl << std::endl;
myos << *(TR1::static_pointer_cast<PVStructure>(pv).get()) << std::endl << std::endl;
else
myos << *(pv.get()) << std::endl << std::endl;
}
@@ -924,7 +924,7 @@ void printValue(std::string const & channelName, PVStructure::shared_pointer con
else
{
// switch to structure mode, unless it's T-type
if (valueType == structure && isTType(static_pointer_cast<PVStructure>(value)))
if (valueType == structure && isTType(TR1::static_pointer_cast<PVStructure>(value)))
{
formatTType(std::cout, TR1::static_pointer_cast<PVStructure>(value));
std::cout << std::endl;
@@ -958,7 +958,7 @@ void printValues(shared_vector<const string> const & names, vector<PVStructure::
{
Type type = value->getField()->getType();
if (type == scalarArray)
scalarArrays.push_back(dynamic_pointer_cast<PVScalarArray>(value));
scalarArrays.push_back(TR1::dynamic_pointer_cast<PVScalarArray>(value));
else if (type == scalar)
{
PVScalar::shared_pointer scalar = TR1::dynamic_pointer_cast<PVScalar>(value);
@@ -1375,7 +1375,7 @@ public:
if (valueType != scalar && valueType != scalarArray)
{
// switch to structure mode, unless it's T-type
if (valueType == structure && isTType(static_pointer_cast<PVStructure>(value)))
if (valueType == structure && isTType(TR1::static_pointer_cast<PVStructure>(value)))
{
if (fieldSeparator == ' ')
std::cout << std::setw(30) << std::left << m_channelName;

10
pvtoolsSrc/pvput.cpp
View File

@@ -231,19 +231,19 @@ size_t fromString(PVFieldPtr const & fieldField, StringArray const & from, size_
}
case scalarArray:
return fromString(static_pointer_cast<PVScalarArray>(fieldField), from, fromStartIndex);
return fromString(TR1::static_pointer_cast<PVScalarArray>(fieldField), from, fromStartIndex);
case structure:
return fromString(static_pointer_cast<PVStructure>(fieldField), from, fromStartIndex);
return fromString(TR1::static_pointer_cast<PVStructure>(fieldField), from, fromStartIndex);
case structureArray:
return fromString(static_pointer_cast<PVStructureArray>(fieldField), from, fromStartIndex);
return fromString(TR1::static_pointer_cast<PVStructureArray>(fieldField), from, fromStartIndex);
case union_:
return fromString(static_pointer_cast<PVUnion>(fieldField), from, fromStartIndex);
return fromString(TR1::static_pointer_cast<PVUnion>(fieldField), from, fromStartIndex);
case unionArray:
return fromString(static_pointer_cast<PVUnionArray>(fieldField), from, fromStartIndex);
return fromString(TR1::static_pointer_cast<PVUnionArray>(fieldField), from, fromStartIndex);
default:
std::ostringstream oss;