You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/06/29 12:48:17 UTC

[incubator-nuttx-apps] branch master updated: cxxtest: Should check CONFIG_CXX_EXCEPTION instead of CONFIG_UCLIBCXX_EXCEPTION

This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new 3a92024  cxxtest: Should check CONFIG_CXX_EXCEPTION instead of CONFIG_UCLIBCXX_EXCEPTION
3a92024 is described below

commit 3a92024b52ad6b7198c87141cd727518cb47a9b5
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon Jun 29 10:26:43 2020 +0800

    cxxtest: Should check CONFIG_CXX_EXCEPTION instead of CONFIG_UCLIBCXX_EXCEPTION
    
    because user may use libcxx which just define CONFIG_LIBCXX_EXCEPTION
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
    Change-Id: I67e7e93cd994e7ad895e93f859f78e038a7a10cb
---
 testing/cxxtest/cxxtest_main.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/cxxtest/cxxtest_main.cxx b/testing/cxxtest/cxxtest_main.cxx
index 45b7f2c..3e0db8a 100644
--- a/testing/cxxtest/cxxtest_main.cxx
+++ b/testing/cxxtest/cxxtest_main.cxx
@@ -219,7 +219,7 @@ static void test_rtti(void)
 // Name: test_exception
 //***************************************************************************/
 
-#ifdef CONFIG_UCLIBCXX_EXCEPTION
+#ifdef CONFIG_CXX_EXCEPTION
 static void test_exception(void)
 {
   std::cout << "test exception==========================" << std::endl;
@@ -258,7 +258,7 @@ extern "C"
     test_iostream();
     test_stl();
     test_rtti();
-#ifdef CONFIG_UCLIBCXX_EXCEPTION
+#ifdef CONFIG_CXX_EXCEPTION
     test_exception();
 #endif