summaryrefslogtreecommitdiffstats
path: root/cxx
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-04-29 21:51:56 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-04-29 21:51:56 +0000
commit5391738c2442d24746ae753421d7bda41617b27b (patch)
treebbdd6d6362a42b4fa951cce71372f8952be7b0d3 /cxx
parent2010-04-29 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff)
downloadrtems-examples-5391738c2442d24746ae753421d7bda41617b27b.tar.bz2
2010-04-29 Joel Sherrill <joel.sherrilL@OARcorp.com>
* cxx_throw/init.cc: Turn off test when BSP_SMALL_MEMORY defined.
Diffstat (limited to 'cxx')
-rw-r--r--cxx/ChangeLog4
-rw-r--r--cxx/cxx_throw/init.cc8
2 files changed, 11 insertions, 1 deletions
diff --git a/cxx/ChangeLog b/cxx/ChangeLog
index a394d6c..b6c64ce 100644
--- a/cxx/ChangeLog
+++ b/cxx/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-29 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * cxx_throw/init.cc: Turn off test when BSP_SMALL_MEMORY defined.
+
2009-08-06 Joel Sherrill <joel.sherrill@oarcorp.com>
* cxx_throw/init.cc, libcpp/Makefile, libcpp/README, libcpp/foo.cc,
diff --git a/cxx/cxx_throw/init.cc b/cxx/cxx_throw/init.cc
index b17341f..d030b67 100644
--- a/cxx/cxx_throw/init.cc
+++ b/cxx/cxx_throw/init.cc
@@ -15,11 +15,14 @@
* $Id$
*/
-#define RTEMS_TEST_IO_STREAM
+#include <bsp.h>
#include <rtems.h>
#include <stdio.h>
#include <stdlib.h>
+
+#if !defined(BSP_SMALL_MEMORY)
+#define RTEMS_TEST_IO_STREAM
#ifdef RTEMS_TEST_IO_STREAM
#include <iostream>
#endif
@@ -128,6 +131,7 @@ cdtest(void)
}
printf( "catch got called, exception handling worked !!!\n" );
}
+#endif
@@ -143,7 +147,9 @@ rtems_task Init(
{
printf( "\n\n*** CONSTRUCTOR/DESTRUCTOR TEST ***\n" );
+#if !defined(BSP_SMALL_MEMORY)
cdtest();
+#endif
printf( "*** END OF CONSTRUCTOR/DESTRUCTOR TEST ***\n\n\n" );