diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-10-31 22:06:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-10-31 22:06:31 +0000 |
| commit | 0b861eafd5bf5d6cdb2c602485310e3733052a10 (patch) | |
| tree | b94fd507fbd8550d430d8f693dab3276c15295c1 /apps | |
| parent | 6dc98fefa9f7d0507c5d83216b34c02145a79b94 (diff) | |
| download | px4-nuttx-0b861eafd5bf5d6cdb2c602485310e3733052a10.tar.gz px4-nuttx-0b861eafd5bf5d6cdb2c602485310e3733052a10.tar.bz2 px4-nuttx-0b861eafd5bf5d6cdb2c602485310e3733052a10.zip | |
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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/examples/Make.defs | 2 | ||||
| -rw-r--r-- | apps/examples/cxxtest/cxxtest_main.cxx (renamed from apps/examples/cxxtest/cxxtext_main.cxx) | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/examples/Make.defs b/apps/examples/Make.defs index 52949ae91..8d36aaa40 100644 --- a/apps/examples/Make.defs +++ b/apps/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/apps/examples/cxxtest/cxxtext_main.cxx b/apps/examples/cxxtest/cxxtest_main.cxx index 0d181d0e4..c0d4bfbd1 100644 --- a/apps/examples/cxxtest/cxxtext_main.cxx +++ b/apps/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 } //*************************************************************************** |