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

anyscalar.h: remove unnecesary vcast

Browse Source 
what was I thinking...
This commit is contained in:
Michael Davidsaver
2018-04-08 15:24:15 -07:00
parent e973422ee1
commit 9ecdb80534
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc/pv/anyscalar.h
View File

@@ -301,7 +301,7 @@ public:
if(_stype!=(ScalarType)ScalarTypeID<TT>::value)
throw bad_cast();
return _as<TT>();
return reinterpret_cast<TT&>(_wrap.blob);
}
template<typename T>
@@ -313,7 +313,7 @@ public:
if(_stype!=(ScalarType)ScalarTypeID<TT>::value)
throw bad_cast();
return _as<TT>();
return reinterpret_cast<typename meta::decorate_const<TT>::type&>(_wrap.blob);
}
/** copy out wrapped value, with a value conversion. */

10
testApp/misc/testanyscalar.cpp
View File

@@ -73,6 +73,14 @@ void test_basic()
testEqual(I.as<double>(), 42.0);
testEqual(I.as<std::string>(), "42");
const pvd::AnyScalar I2(I);
testEqual(I2.type(), pvd::pvInt);
testEqual(I2.ref<pvd::int32>(), 42);
testEqual(I2.as<pvd::int32>(), 42);
testEqual(I2.as<double>(), 42.0);
testEqual(I2.as<std::string>(), "42");
testThrows(pvd::AnyScalar::bad_cast, I.ref<double>());
{
@@ -230,7 +238,7 @@ void test_move()
MAIN(testanyscalar)
{
testPlan(70);
testPlan(75);
try {
test_empty();
test_ctor();