From: Peter Howkins <flibble@users.sourceforge.net>
Date: Tue, 13 Mar 2012 17:31:56 +0000 (+0000)
Subject: Include <iostream> without the .h on modern C++
X-Git-Tag: 2.2.0a~26^2~73
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=adf14ccd770b70fae91a4ce3ed7896abdb7313a1;p=oweals%2Fcde.git

Include <iostream> without the .h on modern C++
---

diff --git a/cde/programs/dtsearchpath/dtappg/Options.C b/cde/programs/dtsearchpath/dtappg/Options.C
index fa242a0d..24e11cdc 100644
--- a/cde/programs/dtsearchpath/dtappg/Options.C
+++ b/cde/programs/dtsearchpath/dtappg/Options.C
@@ -31,7 +31,11 @@
 
 #include "Options.h"
 #include <stdlib.h>
+#if defined(linux)
+#include <iostream>
+#else
 #include <iostream.h>
+#endif
 #include <stdio.h>
 #include <pwd.h>
 
diff --git a/cde/programs/dtsearchpath/dtappg/dtappgather.C b/cde/programs/dtsearchpath/dtappg/dtappgather.C
index 55529159..ee09040d 100644
--- a/cde/programs/dtsearchpath/dtappg/dtappgather.C
+++ b/cde/programs/dtsearchpath/dtappg/dtappgather.C
@@ -75,7 +75,11 @@
 #include "dtappgather.h"
 #include "DirIterator.h"
 #include <stdlib.h>
+#if defined(linux)
+#include <iostream>
+#else
 #include <iostream.h>
+#endif
 
 Options * options;