SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-16 13:06:05 +00:00
parent 1d621d07b8
commit 614dacbbf5
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src_main/core/piobject.h
View File

@@ -637,8 +637,10 @@ public:
if (ts) i.dest_o->mutex_.lock(); if (ts) i.dest_o->mutex_.lock();
i.dest_o->emitter_ = sender; i.dest_o->emitter_ = sender;
((void( *)(void * ))i.slot)(i.dest); ((void( *)(void * ))i.slot)(i.dest);
i.dest_o->emitter_ = 0; if (i.dest_o->isPIObject()) {
if (ts) i.dest_o->mutex_.unlock(); i.dest_o->emitter_ = 0;
if (ts) i.dest_o->mutex_.unlock();
}
} }
#ifdef PIP_CXX11_SUPPORT #ifdef PIP_CXX11_SUPPORT
} }
@@ -667,8 +669,10 @@ public:
i.dest_o->emitter_ = sender; i.dest_o->emitter_ = sender;
if (i.args_count == 0) ((void(*)(void *))i.slot)(i.dest); if (i.args_count == 0) ((void(*)(void *))i.slot)(i.dest);
else ((void(*)(void * , T0))i.slot)(i.dest, v0); else ((void(*)(void * , T0))i.slot)(i.dest, v0);
i.dest_o->emitter_ = 0; if (i.dest_o->isPIObject()) {
if (ts) i.dest_o->mutex_.unlock(); i.dest_o->emitter_ = 0;
if (ts) i.dest_o->mutex_.unlock();
}
} }
#ifdef PIP_CXX11_SUPPORT #ifdef PIP_CXX11_SUPPORT
} }
@@ -700,8 +704,10 @@ public:
case 1: ((void(*)(void * , T0))i.slot)(i.dest, v0); break; case 1: ((void(*)(void * , T0))i.slot)(i.dest, v0); break;
default: ((void(*)(void * , T0, T1))i.slot)(i.dest, v0, v1); break; default: ((void(*)(void * , T0, T1))i.slot)(i.dest, v0, v1); break;
} }
i.dest_o->emitter_ = 0; if (i.dest_o->isPIObject()) {
if (ts) i.dest_o->mutex_.unlock(); i.dest_o->emitter_ = 0;
if (ts) i.dest_o->mutex_.unlock();
}
} }
#ifdef PIP_CXX11_SUPPORT #ifdef PIP_CXX11_SUPPORT
} }
@@ -735,8 +741,10 @@ public:
case 2: ((void(*)(void * , T0, T1))i.slot)(i.dest, v0, v1); break; case 2: ((void(*)(void * , T0, T1))i.slot)(i.dest, v0, v1); break;
default: ((void(*)(void * , T0, T1, T2))i.slot)(i.dest, v0, v1, v2); break; default: ((void(*)(void * , T0, T1, T2))i.slot)(i.dest, v0, v1, v2); break;
} }
i.dest_o->emitter_ = 0; if (i.dest_o->isPIObject()) {
if (ts) i.dest_o->mutex_.unlock(); i.dest_o->emitter_ = 0;
if (ts) i.dest_o->mutex_.unlock();
}
} }
#ifdef PIP_CXX11_SUPPORT #ifdef PIP_CXX11_SUPPORT
} }
@@ -772,8 +780,10 @@ public:
case 3: ((void(*)(void * , T0, T1, T2))i.slot)(i.dest, v0, v1, v2); break; case 3: ((void(*)(void * , T0, T1, T2))i.slot)(i.dest, v0, v1, v2); break;
default: ((void(*)(void * , T0, T1, T2, T3))i.slot)(i.dest, v0, v1, v2, v3); break; default: ((void(*)(void * , T0, T1, T2, T3))i.slot)(i.dest, v0, v1, v2, v3); break;
} }
i.dest_o->emitter_ = 0; if (i.dest_o->isPIObject()) {
if (ts) i.dest_o->mutex_.unlock(); i.dest_o->emitter_ = 0;
if (ts) i.dest_o->mutex_.unlock();
}
} }
#ifdef PIP_CXX11_SUPPORT #ifdef PIP_CXX11_SUPPORT
} }