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

PIDir fix PICoutManipulator

Browse Source 
git-svn-id: svn://db.shs.com.ru/pip@68 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
Пелипенко Иван
2015-04-07 09:40:58 +00:00
parent 8e7b44f6be
commit 51da261a56
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/io/pidiagnostics.h
View File

@@ -32,7 +32,7 @@ class PIP_EXPORT PIDiagnostics: public PITimer
friend class PIConnection; friend class PIConnection;
public: public:
//! Constructs an empty diagnostics and if "strat_" start it //! Constructs an empty diagnostics and if "start_" start it
PIDiagnostics(bool start_ = true); PIDiagnostics(bool start_ = true);
virtual ~PIDiagnostics() {;} virtual ~PIDiagnostics() {;}

1
src/io/pidir.cpp
View File

@@ -165,6 +165,7 @@ PIString PIDir::relative(const PIString & path) const {
PIDir & PIDir::setDir(const PIString & path) { PIDir & PIDir::setDir(const PIString & path) {
path_ = path; path_ = path;
#ifdef WINDOWS #ifdef WINDOWS
path_.replaceAll("\\", separator);
if (path_.length() > 2) if (path_.length() > 2)
if (path_.mid(1, 2).contains(":")) if (path_.mid(1, 2).contains(":"))
path_.prepend(separator); path_.prepend(separator);

3
utils/udp_file_transfer/main.cpp
View File

@@ -113,12 +113,13 @@ int main (int argc, char * argv[]) {
if (fls.size() > 0) { if (fls.size() > 0) {
piCout << "send files" << fls; piCout << "send files" << fls;
f.startSend(fls); f.startSend(fls);
PICout(0) << "\n";
return 0; return 0;
} else { } else {
piCout << "wait for receiving"; piCout << "wait for receiving";
} }
WAIT_FOR_EXIT WAIT_FOR_EXIT
PICout() << "\n"; PICout(0) << "\n";
return 0; return 0;
} }