OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

libcxx: fix compile error 

from ServiceManager.cpp:17:
/home/ligd/platform/dev/apps/external/android/frameworks/native/libs/binder/ndk/include_cpp/android/binder_to_string.h:71:24: error: expected nested-name-specifier before numeric constant
   71 |     template <typename _U>
      |                        ^~
/home/ligd/platform/dev/apps/external/android/frameworks/native/libs/binder/ndk/include_cpp/android/binder_to_string.h:71:24: error: expected ‘>’ before numeric constant
In file included from /home/ligd/platform/dev/apps/external/android/frameworks/native/libs/binder/aidl/android/os/ConnectionInfo.h:3,
                 from /home/ligd/platform/dev/apps/external/android/frameworks/native/libs/binder/aidl/android/os/IServiceManager.h:3,
                 from /home/ligd/platform/dev/apps/external/android/frameworks/native/libs/binder/aidl/android/os/BnServiceManager.h:4:
/home/ligd/platform/dev/apps/external/android/frameworks/native/libs/binder/ndk/include_cpp/android/binder_to_string.h:72:56: error: no matching function for call to ‘declval<1>()’
   72 |     static auto _test(int) -> decltype(std::declval<_U>().toString(), std::true_type());
      |                                        ~~~~~~~~~~~~~~~~^~
In file included from /home/ligd/platform/dev/nuttx/include/libcxx/__type_traits/is_convertible.h:18,

Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2024-10-17 21:54:47 +08:00 committed by Xiang Xiao
parent 974da12448
commit cdccce48ac
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ctype.h
View File

@ -35,7 +35,7 @@
#include <nuttx/compiler.h> #include <nuttx/compiler.h>
#include <langinfo.h> #include <langinfo.h>
#ifndef _MSC_VER #ifdef CONFIG_LIBCXXTOOLCHAIN
/* GNU libstdc++ is expecting ctype.h to define a few macros for /* GNU libstdc++ is expecting ctype.h to define a few macros for
* locale related functions like C++ streams. * locale related functions like C++ streams.

7
libs/libc/ctype/lib_ctype.c
View File

@ -32,7 +32,7 @@
* Macro Definitions * Macro Definitions
****************************************************************************/ ****************************************************************************/
#if defined(_MSC_VER) #ifndef CONFIG_LIBCXXTOOLCHAIN
/* MSVC seems to conflict with theses macro if defined in the public area. /* MSVC seems to conflict with theses macro if defined in the public area.
* As such, they are defined in the private section to let NuttX build * As such, they are defined in the private section to let NuttX build
@ -47,7 +47,7 @@
#define _X 0100 #define _X 0100
#define _B 0200 #define _B 0200
#endif #else
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
@ -98,3 +98,6 @@ const char _ctype_[] =
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
#endif