openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove checks for _USING_LIBCXX 

__cplusplus is enough

Test: build
Change-Id: Ia0cf3b5beafe41ae1ce17335b5b06c753e665a32
This commit is contained in:
Tom Cherry 2019-01-15 18:22:37 -08:00
parent dea312bf14
commit e5b615076b
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
liblog/include/log/log_event_list.h
View File

@ -20,10 +20,8 @@
#include <errno.h>
#include <stdint.h>
#if (defined(__cplusplus) && defined(_USING_LIBCXX))
extern "C++" {
#ifdef __cplusplus
#include <string>
}
#endif
#include <log/log.h>
@ -208,14 +206,12 @@ class android_log_event_list {
return *this;
}
#if defined(_USING_LIBCXX)
android_log_event_list& operator<<(const std::string& value) {
int retval =
android_log_write_string8_len(ctx, value.data(), value.length());
if (retval < 0) ret = retval;
return *this;
}
#endif
android_log_event_list& operator<<(float value) {
int retval = android_log_write_float32(ctx, value);
@ -269,7 +265,6 @@ class android_log_event_list {
return ret >= 0;
}
#if defined(_USING_LIBCXX)
bool AppendString(const std::string& value) {
int retval =
android_log_write_string8_len(ctx, value.data(), value.length());
@ -283,7 +278,6 @@ class android_log_event_list {
if (retval < 0) ret = retval;
return ret;
}
#endif
bool AppendFloat(float value) {
int retval = android_log_write_float32(ctx, value);

6
liblog/include/private/android_logger.h
View File

@ -25,10 +25,8 @@
#include <stdint.h>
#include <sys/types.h>
#if (defined(__cplusplus) && defined(_USING_LIBCXX))
extern "C++" {
#ifdef __cplusplus
#include <string>
}
#endif
#include <log/log.h>
@ -170,7 +168,6 @@ class __android_log_event_list : public android_log_event_list {
: android_log_event_list(log_msg) {
}
#if defined(_USING_LIBCXX)
operator std::string() {
if (ret) return std::string("");
const char* cp = nullptr;
@ -179,7 +176,6 @@ class __android_log_event_list : public android_log_event_list {
if (!cp || (len <= 0)) return std::string("");
return std::string(cp, len);
}
#endif
};
}
#endif