git-svn-id: svn://db.shs.com.ru/pip@773 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -584,20 +584,20 @@ public:
|
|||||||
|
|
||||||
static PIVariant fromValue(const PIByteArray & c, const PIString & type) {
|
static PIVariant fromValue(const PIByteArray & c, const PIString & type) {
|
||||||
PIVariant ret;
|
PIVariant ret;
|
||||||
|
PIVariant::Type t = typeFromName(type);
|
||||||
|
if (t == pivInvalid) {
|
||||||
#ifdef CUSTOM_PIVARIANT
|
#ifdef CUSTOM_PIVARIANT
|
||||||
ret._info = __PIVariantInfoStorage__::get()->map->value(type, 0);
|
ret._info = __PIVariantInfoStorage__::get()->map->value(type, 0);
|
||||||
if (!ret._info) {
|
if (ret._info) {
|
||||||
|
t = pivCustom;
|
||||||
|
} else
|
||||||
#endif
|
#endif
|
||||||
PIVariant::Type t = typeFromName(type);
|
{
|
||||||
if (t == pivInvalid) {
|
|
||||||
piCout << "Can`t initialize PIVariant from unregistered type \"" << type << "\"!";
|
piCout << "Can`t initialize PIVariant from unregistered type \"" << type << "\"!";
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
ret._type = t;
|
}
|
||||||
#ifdef CUSTOM_PIVARIANT
|
ret._type = t;
|
||||||
} else
|
|
||||||
ret._type = pivCustom;
|
|
||||||
#endif
|
|
||||||
ret._content = c;
|
ret._content = c;
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user