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

PIString remove operator char*

Browse Source
This commit is contained in:
Бычков Андрей
2020-09-15 11:24:13 +03:00
parent e10ff53547
commit 78731bd971
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/main/core/pistring.h
View File

@@ -94,19 +94,6 @@ public:
PIString & operator =(PIString && o) {swap(o); return *this;} PIString & operator =(PIString && o) {swap(o); return *this;}
/*! \brief Return c-string representation of string
* \details Converts content of string to c-string and return
* pointer to first char. This buffer is valid until new convertion
* or execution \a data() or \a toByteArray().\n
* Example: \snippet pistring.cpp PIString::char* */
operator const char*() {return data();}
//! Return symbol at index "pos"
PIChar operator [](const int pos) const {return at(pos);}
//! Return reference to symbol at index "pos"
PIChar & operator [](const int pos) {return PIDeque<PIChar>::operator[](pos);}
//! Compare operator //! Compare operator
bool operator ==(const PIString & str) const; bool operator ==(const PIString & str) const;

8
utils/deploy_tool/main.cpp
View File

@@ -316,7 +316,7 @@ void copyWildcard(const PIString & from, const PIString & to) {
PIDir(to).make(); PIDir(to).make();
#ifdef WINDOWS #ifdef WINDOWS
PIFile::FileInfo fi; fi.path = from; PIFile::FileInfo fi; fi.path = from;
system("robocopy \"" + fi.dir() + "\" \"" + to + "\" \"" + fi.name() + "\" /NJH /NJS /NP /NDL /NS /NC /NFL 1> NUL"); system(("robocopy \"" + fi.dir() + "\" \"" + to + "\" \"" + fi.name() + "\" /NJH /NJS /NP /NDL /NS /NC /NFL 1> NUL").data());
#else #else
system(cmd_copy + from + " \"" + to + "/\"" + cmd_suffix); system(cmd_copy + from + " \"" + to + "/\"" + cmd_suffix);
#endif #endif
@@ -644,8 +644,8 @@ int main(int argc, char * argv[]) {
if (need_cp) { if (need_cp) {
piCout << "copy" << l; piCout << "copy" << l;
if (!fake) { if (!fake) {
system(cmd_copy + "\"" + l + "\" \"" + out_dir + "\"" + cmd_suffix); system((cmd_copy + "\"" + l + "\" \"" + out_dir + "\"" + cmd_suffix).data());
system(strip + " --strip-unneeded \"" + out_dir + fi.name() + "\""); system((strip + " --strip-unneeded \"" + out_dir + fi.name() + "\"").data());
} }
} }
} }
@@ -655,7 +655,7 @@ int main(int argc, char * argv[]) {
if (!fd.isEmpty()) { if (!fd.isEmpty()) {
piCout << "copy framework" << f; piCout << "copy framework" << f;
if (!fake) if (!fake)
system(cmd_copydir + "\"" + fd + "\" \"" + out_dir + "\"" + cmd_suffix); system((cmd_copydir + "\"" + fd + "\" \"" + out_dir + "\"" + cmd_suffix).data());
} else } else
miss_frameworks << f; miss_frameworks << f;
} }