Avoid g++ 3.1 deprecation warnings.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 8692efefa0787036db2fa5a782944109ef4fb0d1..57320cb18bd79d503098806c42bc4c56d1b4bef1 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-04  Bruno Haible  <bruno@clisp.org>
+
+       * lang-c++: Use <iostream> instead of <iostream.h> to avoid g++ 3.1
+       deprecation warnings.
+
 2002-04-27  Bruno Haible  <bruno@clisp.org>
 
        * plural-1-prg.c: No need to redirect textdomain() etc., now done in

diff --git a/tests/lang-c++ b/tests/lang-c++
index 47c07281fd9a584dea0e24a6e7fd2fb18ee231c1..430fe274757a0fb75f57901da860462896405e5d 100755 (executable)
--- a/tests/lang-c++
+++ b/tests/lang-c++
@@ -15,7 +15,15 @@ fi
 tmpfiles="$tmpfiles prog.cc"
 cat <<\EOF > prog.cc
 #include "config.h"
-#include <iostream.h>
+
+/* Avoid deprecation warnings from g++ 3.1 or newer.  */
+#if defined __GNUG__ && defined __DEPRECATED
+# include <iostream>
+using namespace std;
+#else
+# include <iostream.h>
+#endif
+
 #include <libintl.h>
 #include <locale.h>
 #include <stdio.h>