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

Commit 89cc78b7 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge \"Fix google-explicit-constructor warnings in system/core.\"

am: 6dc68cb5

Change-Id: I5a010465364b6e14423b19e8c0f9cffa58ee3152
parents 6d287b3d 6dc68cb5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class BacktraceMapMock : public BacktraceMap {

class BacktraceMock : public Backtrace {
 public:
  BacktraceMock(BacktraceMapMock* map) : Backtrace(0, 0, map) {
  explicit BacktraceMock(BacktraceMapMock* map) : Backtrace(0, 0, map) {
    if (map_ == nullptr) {
      abort();
    }
+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ class Socket {

  protected:
    // Protected constructor to force factory function use.
    Socket(cutils_socket_t sock);
    explicit Socket(cutils_socket_t sock);

    // Blocks up to |timeout_ms| until a read is possible on |sock_|, and sets |receive_timed_out_|
    // as appropriate to help distinguish between normal timeouts and fatal errors. Returns true if
+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ private:

class Action {
public:
    Action(bool oneshot = false);
    explicit Action(bool oneshot = false);

    bool AddCommand(const std::vector<std::string>& args,
                    const std::string& filename, int line, std::string* err);
+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ namespace init {
// a TOK_NEWLINE will not be generated for that line.
class Tokenizer {
 public:
  Tokenizer(const std::string& data);
  explicit Tokenizer(const std::string& data);
  ~Tokenizer();

  enum TokenType { TOK_START, TOK_END, TOK_NEWLINE, TOK_TEXT };
+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@

class UnwindMap : public BacktraceMap {
public:
  UnwindMap(pid_t pid);
  explicit UnwindMap(pid_t pid);

  unw_map_cursor_t* GetMapCursor() { return &map_cursor_; }

@@ -39,7 +39,7 @@ protected:

class UnwindMapRemote : public UnwindMap {
public:
  UnwindMapRemote(pid_t pid);
  explicit UnwindMapRemote(pid_t pid);
  virtual ~UnwindMapRemote();

  bool Build() override;
Loading