diff --git a/libs/main/core/pichar.h b/libs/main/core/pichar.h index affd0385..0b17769a 100644 --- a/libs/main/core/pichar.h +++ b/libs/main/core/pichar.h @@ -61,6 +61,10 @@ public: //! \~russian Оператор присваивания PIChar & operator =(const char v) {ch = v; return *this;} + //! \~english Copy operator + //! \~russian Оператор присваивания + PIChar & operator =(const wchar_t v) {ch = v; return *this;} + //! \~english Compare operator //! \~russian Оператор сравнения bool operator ==(const PIChar & o) const; diff --git a/libs/main/core/pistring.cpp b/libs/main/core/pistring.cpp index bc6e0c58..9395c78d 100644 --- a/libs/main/core/pistring.cpp +++ b/libs/main/core/pistring.cpp @@ -248,7 +248,7 @@ void PIString::appendFromChars(const char * c, int s, const char * codepage) { mbsrtowcs(&wstr[0], pc, len+1, &state); if (c_) free(c_); enlarge(len); - for (size_t i=0; i