mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
On linux ostream and endl need prefixing into the std namespace.
This commit is contained in:
parent
adf14ccd77
commit
5d76061f5d
3 changed files with 25 additions and 0 deletions
|
@ -95,15 +95,32 @@ TTFile & TTFile::operator=
|
|||
return *this;
|
||||
}
|
||||
|
||||
#if defined(linux)
|
||||
std::ostream & operator<<
|
||||
(
|
||||
std::ostream & os,
|
||||
TTFile & file
|
||||
)
|
||||
#else
|
||||
ostream & operator<<
|
||||
(
|
||||
ostream & os,
|
||||
TTFile & file
|
||||
)
|
||||
#endif
|
||||
{
|
||||
if (file.ttFileOpFailed())
|
||||
#if defined(linux)
|
||||
return os << "Error in filename mapping; status = "
|
||||
<< file.getStatus() << std::endl;
|
||||
#else
|
||||
return os << "Error in filename mapping; status = "
|
||||
<< file.getStatus() << endl;
|
||||
#endif
|
||||
else
|
||||
#if defined(linux)
|
||||
return os << file.data() << std::endl;
|
||||
#else
|
||||
return os << file.data() << endl;
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -65,7 +65,11 @@ class TTFile : public CString {
|
|||
};
|
||||
#else
|
||||
void TT_Exception (char *);
|
||||
#if defined(linux)
|
||||
friend std::ostream & operator<< (std::ostream &, TTFile &);
|
||||
#else
|
||||
friend ostream & operator<< (ostream &, TTFile &);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
int ttFileOpFailed () { return status != TT_OK; }
|
||||
|
|
|
@ -72,7 +72,11 @@ class CString {
|
|||
int isNull() const;
|
||||
void replace (const CString &, const CString &);
|
||||
|
||||
#if defined(linux)
|
||||
friend std::ostream & operator<< (std::ostream &, const CString &);
|
||||
#else
|
||||
friend ostream & operator<< (ostream &, const CString &);
|
||||
#endif
|
||||
|
||||
protected:
|
||||
char * contents;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue