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

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-25 12:55:47 +00:00
parent 826db9e87d
commit ed059005f9
15 changed files with 101 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src_main/core/pibitarray.cpp
View File

@@ -13,7 +13,7 @@ PICout operator <<(PICout s, const PIBitArray & ba) {
return s;
}
#ifdef PIP_STD_IOSTREAM
std::ostream &operator <<(std::ostream & s, const PIBitArray & ba) {
for (uint i = 0; i < ba.bitSize(); ++i) {
s << ba[i];
@@ -21,4 +21,5 @@ std::ostream &operator <<(std::ostream & s, const PIBitArray & ba) {
}
return s;
}
#endif

4
src_main/core/pibitarray.h
View File

@@ -100,7 +100,9 @@ private:
};
std::ostream & operator <<(std::ostream & s, const PIBitArray & ba);
#ifdef PIP_STD_IOSTREAM
//std::ostream & operator <<(std::ostream & s, const PIBitArray & ba);
#endif
inline PICout operator <<(PICout s, const PIBitArray & ba);

2
src_main/core/pibytearray.cpp
View File

@@ -361,6 +361,7 @@ PICout operator <<(PICout s, const PIByteArray & ba) {
}
#ifdef PIP_STD_IOSTREAM
std::ostream &operator <<(std::ostream & s, const PIByteArray & ba) {
s << "{";
for (uint i = 0; i < ba.size(); ++i) {
@@ -370,3 +371,4 @@ std::ostream &operator <<(std::ostream & s, const PIByteArray & ba) {
s << "}";
return s;
}
#endif

2
src_main/core/pibytearray.h
View File

@@ -125,8 +125,10 @@ public:
inline bool operator <(const PIByteArray & v0, const PIByteArray & v1) {if (v0.size() == v1.size()) {for (uint i = 0; i < v0.size(); ++i) if (v0[i] != v1[i]) return v0[i] < v1[i]; return false;} return v0.size() < v1.size();}
#ifdef PIP_STD_IOSTREAM
//! \relatesalso PIByteArray \brief Output to std::ostream operator
inline std::ostream & operator <<(std::ostream & s, const PIByteArray & ba);
#endif
//! \relatesalso PIByteArray \brief Output to PICout operator
PICout operator <<(PICout s, const PIByteArray & ba);

5
src_main/core/pichar.cpp
View File

@@ -266,13 +266,12 @@ 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();

2
src_main/core/pichar.h
View File

@@ -157,8 +157,10 @@ 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);

2
src_main/core/picout.cpp
View File

@@ -195,7 +195,7 @@ PICout PICout::operator <<(const PICoutAction v) {
PICout PICout::operator <<(const char * v) {if (v[0] == '\0') return *this; space(); quote(); PICOUTTOTARGET(v) quote(); return *this;}
PICout PICout::operator <<(const std::string & v) {space(); quote(); if (PICout::buffer_) __PICout_string__ << StdString2PIString(v); else std::cout << (v); quote(); return *this;}
//PICout PICout::operator <<(const std::string & v) {space(); quote(); if (PICout::buffer_) __PICout_string__ << StdString2PIString(v); else std::cout << (v); quote(); return *this;}
PICout PICout::operator <<(const bool v) {space(); if (v) PICOUTTOTARGET("true") else PICOUTTOTARGET("false") return *this;}

2
src_main/core/picout.h
View File

@@ -123,7 +123,7 @@ public:
PICout operator <<(const char * v);
//! Output operator for strings with <tt>"std::string"</tt> type
PICout operator <<(const std::string & v);
//PICout operator <<(const std::string & v);
//! Output operator for boolean values
PICout operator <<(const bool v);

2
src_main/core/piincludes.h
View File

@@ -25,8 +25,6 @@
#include "pimonitor.h"
#ifdef PIP_STD_IOSTREAM
# include <iostream>
#else
# include <iosfwd>
#endif
extern PIMonitor piMonitor;