From b2a7f2fdc81a1236a65c935c8c43e5157adb19b4 Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 31 Oct 2012 22:06:31 +0000 Subject: [PATCH] Convert configs/sim/ostest to use mconf tool; Add configs/sim/cxxtest git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5285 42af7a65-404d-4744-a932-0658087f49c3 --- examples/Make.defs | 2 +- .../cxxtest/{cxxtext_main.cxx => cxxtest_main.cxx} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename examples/cxxtest/{cxxtext_main.cxx => cxxtest_main.cxx} (99%) diff --git a/examples/Make.defs b/examples/Make.defs index 52949ae91..8d36aaa40 100644 --- a/examples/Make.defs +++ b/examples/Make.defs @@ -54,7 +54,7 @@ ifeq ($(CONFIG_EXAMPLES_COMPOSITE),y) CONFIGURED_APPS += examples/composite endif -ifeq ($(CONFIG_EXAMPLES_CXXTEST,y) +ifeq ($(CONFIG_EXAMPLES_CXXTEST),y) CONFIGURED_APPS += examples/cxxtest endif diff --git a/examples/cxxtest/cxxtext_main.cxx b/examples/cxxtest/cxxtest_main.cxx similarity index 99% rename from examples/cxxtest/cxxtext_main.cxx rename to examples/cxxtest/cxxtest_main.cxx index 0d181d0e4..c0d4bfbd1 100644 --- a/examples/cxxtest/cxxtext_main.cxx +++ b/examples/cxxtest/cxxtest_main.cxx @@ -86,22 +86,22 @@ public: static void test_iostream(void) { - int a; - string s; - cout << "test iostream===========================" << endl; cout << "Hello, this is only a test" << endl; cout << "Print an int: " << 190 << endl; - cout << "Print a char: " << 'd' << endl; + cout << "Print a char: " << 'd' << endl; + +#if 0 + int a; + string s; -/* cout << "Please type in an int:" << endl; cin >> a; cout << "You type in: " << a << endl; cout << "Please type in a string:" << endl; cin >> s; cout << "You type in: " << s << endl; -*/ +#endif } //***************************************************************************