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@496 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2017-05-07 09:36:13 +00:00
parent b9c609ecad
commit e33406b283
10 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src_main/core/pichar.cpp
View File

@@ -266,13 +266,6 @@ PIChar PIChar::toLower() const {
}
#ifdef PIP_STD_IOSTREAM
std::ostream & operator <<(std::ostream & s, const PIChar & v) {
s << v.toCharPtr();
return s;
}
#endif
PICout operator <<(PICout s, const PIChar & v) {
s.space();
s.setControl(0, true);

5
src_main/core/pichar.h
View File

@@ -157,11 +157,6 @@ private:
};
#ifdef PIP_STD_IOSTREAM
//! Output operator to \c std::ostream
std::ostream & operator <<(std::ostream & s, const PIChar & v);
#endif
//! Output operator to \a PICout
PICout operator <<(PICout s, const PIChar & v);

10
src_main/core/piobject.cpp
View File

@@ -101,7 +101,7 @@ bool PIObject::execute(const PIString & method, const PIVector<PIVariant> & vl)
bool ok = findSuitableMethodV(method, vl.size_s(), ac, func);
if (!ok)
return false;
callAddrV(func.addrV, this, ac, vl);
callAddrV(func.addrV, toThis(), ac, vl);
return true;
}
@@ -120,7 +120,7 @@ bool PIObject::executeQueued(PIObject * performer, const PIString & method, cons
bool ok = findSuitableMethodV(method, vl.size_s(), ac, func);
if (!ok)
return false;
performer->postQueuedEvent(QueuedEvent(func.addrV, this, this, performer, vl));
performer->postQueuedEvent(QueuedEvent(func.addrV, toThis(), this, performer, vl));
performer->proc_event_queue = true;
return true;
}
@@ -399,6 +399,12 @@ void PIObject::postQueuedEvent(const PIObject::QueuedEvent & e) {
}
void * PIObject::toThis() const {
//piCout << ptrOffset() << (void*)this << (void*)((char*)this - ptrOffset());
return (void*)((char*)this - ptrOffset());
}
PIMutex & PIObject::__meta_mutex() {
static PIMutex ret;
return ret;

5
src_main/core/piobject.h
View File

@@ -195,7 +195,8 @@
public: \
static const PIString __classNameS() {return PIStringAscii(#name);} \
virtual const char * className() const {return #name;} \
private:
private: \
virtual int ptrOffset() const {name * o = (name*)100; return int(llong((PIObject*)o) - llong(o));}
#define PIOBJECT_PARENT(name) \
class __##name##_ParentInitializer__ { \
@@ -885,6 +886,8 @@ private:
__MetaFunc methodEH(const void * addr) const;
void updateConnectors();
void postQueuedEvent(const QueuedEvent & e);
void * toThis() const;
virtual int ptrOffset() const {return 0;}
static PIVector<PIObject * > & objects();
static void callAddrV(void * slot, void * obj, int args, const PIVector<PIVariant> & vl);

2
src_main/core/pistring_std.h
View File

@@ -75,6 +75,8 @@ inline PIString StdWString2PIString(const std::wstring & v) {
//! \relatesalso PIChar \brief Output operator to \c std::ostream
inline std::ostream & operator <<(std::ostream & s, const PIChar & v) {s << v.toCharPtr(); return s;}
//! \relatesalso PIString \brief Return concatenated string
inline PIString operator +(const PIString & f, const std::string & str) {PIString s(f); s += StdString2PIString(str); return s;}