From: Peter Howkins <flibble@users.sourceforge.net>
Date: Tue, 13 Mar 2012 17:45:34 +0000 (+0000)
Subject: namespace ostream into std::ostream for modern C++
X-Git-Tag: 2.2.0a~26^2~69
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=167fd854e1309b51f4526cb3ea66d1c508db743f;p=oweals%2Fcde.git

namespace ostream into std::ostream for modern C++
---

diff --git a/cde/programs/dtsearchpath/libCliSrv/cstring.C b/cde/programs/dtsearchpath/libCliSrv/cstring.C
index 0bb56884..be3067fc 100644
--- a/cde/programs/dtsearchpath/libCliSrv/cstring.C
+++ b/cde/programs/dtsearchpath/libCliSrv/cstring.C
@@ -564,11 +564,19 @@ char * q  = 0;
     }
 }
 
+#if defined(linux)
+std::ostream & operator<<
+	(
+	std::ostream &       os,
+	const CString & s
+	)
+#else
 ostream & operator<<
 	(
 	ostream &       os,
 	const CString & s
 	)
+#endif
 {
     if (s.isNull())
 	return os << "(null)";