external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

On linux ostream and endl need prefixing into the std namespace.

Browse source
This commit is contained in:
Peter Howkins 2012-03-13 17:40:21 +00:00
parent adf14ccd77
commit 5d76061f5d
3 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cde/programs/dtsearchpath/libCliSrv/TTFile.C
View file

@ -95,15 +95,32 @@ TTFile & TTFile::operator=
return *this; return *this;
} }
#if defined(linux)
std::ostream & operator<<
(
std::ostream & os,
TTFile & file
)
#else
ostream & operator<< ostream & operator<<
( (
ostream & os, ostream & os,
TTFile & file TTFile & file
) )
#endif
{ {
if (file.ttFileOpFailed()) 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 = " return os << "Error in filename mapping; status = "
<< file.getStatus() << endl; << file.getStatus() << endl;
#endif
else else
#if defined(linux)
return os << file.data() << std::endl;
#else
return os << file.data() << endl; return os << file.data() << endl;
#endif
} }

4
cde/programs/dtsearchpath/libCliSrv/TTFile.h
View file

@ -65,7 +65,11 @@ class TTFile : public CString {
}; };
#else #else
void TT_Exception (char *); void TT_Exception (char *);
#if defined(linux)
friend std::ostream & operator<< (std::ostream &, TTFile &);
#else
friend ostream & operator<< (ostream &, TTFile &); friend ostream & operator<< (ostream &, TTFile &);
#endif
#endif #endif
int ttFileOpFailed () { return status != TT_OK; } int ttFileOpFailed () { return status != TT_OK; }

4
cde/programs/dtsearchpath/libCliSrv/cstring.h
View file

@ -72,7 +72,11 @@ class CString {
int isNull() const; int isNull() const;
void replace (const CString &, const CString &); void replace (const CString &, const CString &);
#if defined(linux)
friend std::ostream & operator<< (std::ostream &, const CString &);
#else
friend ostream & operator<< (ostream &, const CString &); friend ostream & operator<< (ostream &, const CString &);
#endif
protected: protected:
char * contents; char * contents;