debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kill iostream.h deprecation warnings on *BSD.

Browse Source
This commit is contained in:
Pascal Stumpf
2013-07-23 13:21:51 +02:00
committed by Jon Trulson
parent f9a70b5165
commit 380232cb93
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cde/programs/dtsearchpath/libCliSrv/TTFile.C
View File

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

2
cde/programs/dtsearchpath/libCliSrv/TTFile.h
View File

@@ -65,7 +65,7 @@ class TTFile : public CString {
}; };
#else #else
void TT_Exception (char *); void TT_Exception (char *);
#if defined(linux) #if defined(linux) || defined(CSRG_BASED)
friend std::ostream & operator<< (std::ostream &, TTFile &); friend std::ostream & operator<< (std::ostream &, TTFile &);
#else #else
friend ostream & operator<< (ostream &, TTFile &); friend ostream & operator<< (ostream &, TTFile &);

2
cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
View File

@@ -37,7 +37,7 @@
#endif #endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#if defined(linux) #if defined(linux) || defined(CSRG_BASED)
#include <iostream> #include <iostream>
#else #else
#include <iostream.h> #include <iostream.h>

2
cde/programs/dtsearchpath/libCliSrv/cstring.C
View File

@@ -566,7 +566,7 @@ int i;
} }
} }
#if defined(linux) #if defined(linux) || defined(CSRG_BASED)
std::ostream & operator<< std::ostream & operator<<
( (
std::ostream & os, std::ostream & os,

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

@@ -32,7 +32,7 @@
#ifndef _CSTRING_H_ #ifndef _CSTRING_H_
#define _CSTRING_H_ #define _CSTRING_H_
#if defined(linux) #if defined(linux) || defined(CSRG_BASED)
#include <iostream> #include <iostream>
#else #else
#include <iostream.h> #include <iostream.h>
@@ -72,7 +72,7 @@ class CString {
int isNull() const; int isNull() const;
void replace (const CString &, const CString &); void replace (const CString &, const CString &);
#if defined(linux) #if defined(linux) || defined(CSRG_BASED)
friend std::ostream & operator<< (std::ostream &, const CString &); friend std::ostream & operator<< (std::ostream &, const CString &);
#else #else
friend ostream & operator<< (ostream &, const CString &); friend ostream & operator<< (ostream &, const CString &);