git-svn-id: svn://db.shs.com.ru/pip@773 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

This commit is contained in:
2019-04-03 13:23:51 +00:00
parent 23afa56092
commit 5069bf05a7

View File

@@ -584,20 +584,20 @@ public:
static PIVariant fromValue(const PIByteArray & c, const PIString & type) {
PIVariant ret;
PIVariant::Type t = typeFromName(type);
if (t == pivInvalid) {
#ifdef CUSTOM_PIVARIANT
ret._info = __PIVariantInfoStorage__::get()->map->value(type, 0);
if (!ret._info) {
ret._info = __PIVariantInfoStorage__::get()->map->value(type, 0);
if (ret._info) {
t = pivCustom;
} else
#endif
PIVariant::Type t = typeFromName(type);
if (t == pivInvalid) {
{
piCout << "Can`t initialize PIVariant from unregistered type \"" << type << "\"!";
return ret;
}
ret._type = t;
#ifdef CUSTOM_PIVARIANT
} else
ret._type = pivCustom;
#endif
}
ret._type = t;
ret._content = c;
return ret;
}