Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38faafcc authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "Remove checks for _USING_LIBCXX" 

am: 3a4591c7

Change-Id: I91c37cee2a300d4fafcc12dbed290077315e8619
parents d9dac07d 3a4591c7

liblog/include/log/log_event_list.h

+1 −7
Original line number Diff line number Diff line
@@ -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>
@@ -196,14 +194,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);
@@ -257,7 +253,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());
@@ -271,7 +266,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);

liblog/include/private/android_logger.h

+1 −5
Original line number Diff line number Diff line
@@ -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