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

Commit 4ed48159 authored by Yi Kong's avatar Yi Kong Committed by Gerrit Code Review
Browse files

Merge "Modernise code to use std::make_unique"

parents 3964935f 0f4c679a
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@

#include <gtest/gtest.h>

#include <memory>

using android::pdx::ErrorStatus;
using android::pdx::Status;

@@ -84,8 +86,8 @@ TEST(Status, Move) {
  Status<std::unique_ptr<int>> status1;
  Status<std::unique_ptr<int>> status2;

  status1 = Status<std::unique_ptr<int>>{std::unique_ptr<int>{new int{11}}};
  status2 = Status<std::unique_ptr<int>>{std::unique_ptr<int>{new int{12}}};
  status1 = Status<std::unique_ptr<int>>{std::make_unique<int>(int{11})};
  status2 = Status<std::unique_ptr<int>>{std::make_unique<int>(int{12})};
  EXPECT_FALSE(status1.empty());
  EXPECT_FALSE(status2.empty());
  EXPECT_TRUE(status1.ok());
@@ -114,7 +116,7 @@ TEST(Status, Move) {
}

TEST(Status, Take) {
  Status<std::unique_ptr<int>> status{std::unique_ptr<int>{new int{123}}};
  Status<std::unique_ptr<int>> status{std::make_unique<int>(int{123})};
  EXPECT_FALSE(status.empty());
  EXPECT_NE(nullptr, status.get());

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@
#include <hardware/gralloc1.h>
#include <log/log.h>

#include <memory>

#include "impl/vr_hwc.h"
#include "impl/vr_composer_client.h"

@@ -39,7 +41,7 @@ VrComposerClient::~VrComposerClient() {}

std::unique_ptr<ComposerCommandEngine>
VrComposerClient::createCommandEngine() {
  return std::unique_ptr<VrCommandEngine>(new VrCommandEngine(*this));
  return std::make_unique<VrCommandEngine>(*this);
}

VrComposerClient::VrCommandEngine::VrCommandEngine(VrComposerClient& client)