From 51ca358ac75271c6ddd10cc0fd2460ba88a45015 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 10 May 2004 16:02:11 +0000
Subject: 2004-05-10	Ralf Corsepius <ralf_corsepius@rtems.org>

	* configure.ac: Add CXX-checks. New conditionals CXXTESTS, MPTESTS,
	NETTESTS. Add iostream/.
	* Makefile.am, base_mp/node1/Makefile.am, base_mp/node2/Makefile.am
	cdtest/Makefile.am, loopback/Makefile.am, pppd/Makefile.am:
	Reflect changes above.
	* cdtest/main.cc: Adaptation to new C++ standards.
---
 testsuites/samples/cdtest/Makefile.am |  6 ++----
 testsuites/samples/cdtest/main.cc     | 10 ++++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'testsuites/samples/cdtest')

diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index fec4459bf8..30c597c720 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -29,18 +29,16 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
+# AM_CPPFLAGS += -DRTEMS_TEST_IO_STREAM
+
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-if HAS_CXX
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-cxx-exe)
 
 all-local: $(TMPINSTALL_FILES)
-else
-all-local:
-endif
 
 EXTRA_DIST = $(C_FILES) $(CC_FILES) $(DOCS)
 
diff --git a/testsuites/samples/cdtest/main.cc b/testsuites/samples/cdtest/main.cc
index 25dd0e2a63..1705c214db 100644
--- a/testsuites/samples/cdtest/main.cc
+++ b/testsuites/samples/cdtest/main.cc
@@ -26,10 +26,12 @@
  */
 
 #include <rtems.h>
-#include <stdio.h>
-#include <stdlib.h>
+
+#include <cstdio>
+#include <cstdlib>
+
 #ifdef RTEMS_TEST_IO_STREAM
-#include <iostream.h>
+#include <iostream>
 #endif
 
 extern "C" 
@@ -144,7 +146,7 @@ cdtest(void)
     BClass bleak;
 
 #ifdef RTEMS_TEST_IO_STREAM
-    cout << "Testing a C++ I/O stream" << endl;
+    std::cout << "Testing a C++ I/O stream" << std::endl;
 #else
     printf("IO Stream not tested\n");
 #endif
-- 
cgit v1.2.3