Kill iostream.h deprecation warnings on *BSD.

diff --git a/cde/programs/dtsearchpath/libCliSrv/TTFile.C b/cde/programs/dtsearchpath/libCliSrv/TTFile.C
index 2a0ec64ef1ba3eb5d939b4c04fe366347ce7647d..d55efac71d1792aaae98e362b9b6c64ec6b94443 100644 (file)
--- 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 b5f0e8afccfe744e636cbd1b7912352fdbfbf4b8..67f3f79e3f83b62bb6e9e0c2c0cc5e53e2de8811 100644 (file)
--- 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 e00bb2c5215b2ed02f1365be6975f8a8c44ab811..63e1f986952f3d6eec3f0c44388d3a37a395a623 100644 (file)
--- 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 dc735e23e1e9ba63cc1a0ba63aaef3a9f9053656..da5e5b0561e82d090697c52a747f162b3565f804 100644 (file)
--- 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 8de0ba85296168da75f5ba7a3450d1e08fa643f9..8133f7f699e190948568743cb4ad1de2042f2955 100644 (file)
--- 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 &);