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

This commit is contained in:
2016-07-25 14:23:15 +00:00
parent a0ac0dde6e
commit 4c30988c77
5 changed files with 39 additions and 20 deletions

View File

@@ -48,7 +48,9 @@
* \endcode
* */
#ifdef CUSTOM_PIVARIANT
PIMap<PIString, __PIVariantInfo__ * > * __PIVariantInfoStorage__::map = 0;
#endif
PIVariant::PIVariant() {
@@ -59,7 +61,9 @@ PIVariant::PIVariant() {
PIVariant & PIVariant::operator =(const PIVariant & v) {
_type = v._type;
_content = v._content;
#ifdef CUSTOM_PIVARIANT
_info = v._info;
#endif
return *this;
}
@@ -101,8 +105,10 @@ PIVariant::Type PIVariant::typeFromName(const PIString & tname) {
PIString PIVariant::typeName() const {
#ifdef CUSTOM_PIVARIANT
if ((_type == Custom) && _info)
return _info->typeName;
#endif
return typeName(_type);
}