See patch.
>From a14899dc8d36ab1cd0b72f8a891aed01c38bcc88 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf <pascal.stu...@cubes.de>
Date: Tue, 23 Jul 2013 13:21:51 +0200
Subject: [PATCH] Kill iostream.h deprecation warnings on *BSD.
---
cde/programs/dtsearchpath/libCliSrv/TTFile.C | 6 +++---
cde/programs/dtsearchpath/libCliSrv/TTFile.h | 2 +-
cde/programs/dtsearchpath/libCliSrv/UnixEnv.C | 2 +-
cde/programs/dtsearchpath/libCliSrv/cstring.C | 2 +-
cde/programs/dtsearchpath/libCliSrv/cstring.h | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cde/programs/dtsearchpath/libCliSrv/TTFile.C
b/cde/programs/dtsearchpath/libCliSrv/TTFile.C
index 2a0ec64..d55efac 100644
--- a/cde/programs/dtsearchpath/libCliSrv/TTFile.C
+++ b/cde/programs/dtsearchpath/libCliSrv/TTFile.C
@@ -95,7 +95,7 @@ TTFile & TTFile::operator=
return *this;
}
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
std::ostream & operator<<
(
std::ostream & os,
@@ -110,7 +110,7 @@ ostream & operator<<
#endif
{
if (file.ttFileOpFailed())
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
return os << "Error in filename mapping; status = "
<< file.getStatus() << std::endl;
#else
@@ -118,7 +118,7 @@ ostream & operator<<
<< file.getStatus() << endl;
#endif
else
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
return os << file.data() << std::endl;
#else
return os << file.data() << endl;
diff --git a/cde/programs/dtsearchpath/libCliSrv/TTFile.h
b/cde/programs/dtsearchpath/libCliSrv/TTFile.h
index b5f0e8a..67f3f79 100644
--- a/cde/programs/dtsearchpath/libCliSrv/TTFile.h
+++ b/cde/programs/dtsearchpath/libCliSrv/TTFile.h
@@ -65,7 +65,7 @@ class TTFile : public CString {
};
#else
void TT_Exception (char *);
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
friend std::ostream & operator<< (std::ostream &, TTFile &);
#else
friend ostream & operator<< (ostream &, TTFile &);
diff --git a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
index e00bb2c..63e1f98 100644
--- a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
+++ b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
@@ -37,7 +37,7 @@
#endif
#include <stdlib.h>
#include <string.h>
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
#else
#include <iostream.h>
diff --git a/cde/programs/dtsearchpath/libCliSrv/cstring.C
b/cde/programs/dtsearchpath/libCliSrv/cstring.C
index dc735e2..da5e5b0 100644
--- a/cde/programs/dtsearchpath/libCliSrv/cstring.C
+++ b/cde/programs/dtsearchpath/libCliSrv/cstring.C
@@ -566,7 +566,7 @@ int i;
}
}
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
std::ostream & operator<<
(
std::ostream & os,
diff --git a/cde/programs/dtsearchpath/libCliSrv/cstring.h
b/cde/programs/dtsearchpath/libCliSrv/cstring.h
index 8de0ba8..8133f7f 100644
--- a/cde/programs/dtsearchpath/libCliSrv/cstring.h
+++ b/cde/programs/dtsearchpath/libCliSrv/cstring.h
@@ -32,7 +32,7 @@
#ifndef _CSTRING_H_
#define _CSTRING_H_
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
#include <iostream>
#else
#include <iostream.h>
@@ -72,7 +72,7 @@ class CString {
int isNull() const;
void replace (const CString &, const CString &);
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
friend std::ostream & operator<< (std::ostream &, const CString &);
#else
friend ostream & operator<< (ostream &, const CString &);
--
1.8.3.1
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
