PICout refactoring, new SHSTKMacros
This commit is contained in:
@@ -154,7 +154,7 @@ BINARY_STREAM_READ (PIBaseTransfer::Part) {s >> v.id >> v.size >> v.start; retur
|
||||
BINARY_STREAM_WRITE(PIBaseTransfer::StartRequest) {s << v.packets << v.size; return s;}
|
||||
BINARY_STREAM_READ (PIBaseTransfer::StartRequest) {s >> v.packets >> v.size; return s;}
|
||||
|
||||
inline PICout operator <<(PICout s, const PIBaseTransfer::Part & v) {s.setControl(0, true); s << "Part(\"" << v.id << "\", " << PIString::readableSize(v.start) << " b | " << PIString::readableSize(v.size) << " b)"; s.restoreControl(); return s;}
|
||||
inline PICout operator <<(PICout s, const PIBaseTransfer::Part & v) {s.saveAndSetControls(0); s << "Part(\"" << v.id << "\", " << PIString::readableSize(v.start) << " b | " << PIString::readableSize(v.size) << " b)"; s.restoreControls(); return s;}
|
||||
|
||||
|
||||
#endif // PIBASETRANSFER_H
|
||||
|
||||
@@ -126,12 +126,12 @@ BINARY_STREAM_READ (PIFileTransfer::PFTFileInfo) {
|
||||
}
|
||||
|
||||
inline PICout operator <<(PICout s, const PIFileTransfer::PFTFileInfo & v) {
|
||||
s.setControl(0, true);
|
||||
s.saveAndSetControls(0);
|
||||
s << "FileInfo(\"" << v.dest_path << "\", " << PIString::readableSize(v.size) << ", "
|
||||
<< v.perm_user.toString() << " " << v.perm_group.toString() << " " << v.perm_other.toString() << ", "
|
||||
<< v.time_access.toString() << ", " << v.time_modification.toString()
|
||||
<< ", 0x" << PICoutManipulators::Hex << v.flags << ")";
|
||||
s.restoreControl();
|
||||
s.restoreControls();
|
||||
return s;
|
||||
}
|
||||
#endif // PIFILETRANSFER_H
|
||||
|
||||
Reference in New Issue
Block a user