This is an archive of the discontinued LLVM Phabricator instance.

Adding qualifier for make_unique.
ClosedPublic

Authored by aizatsky on Nov 11 2015, 1:29 PM.

Reviewers

samsonov

Commits

Summary

MSVC gets confused.

aizatsky retitled this revision from to Adding qualifier for make_unique..

aizatsky updated this object.

aizatsky added a subscriber: llvm-commits.

another one

This revision was automatically updated to reflect the committed changes.

Path

Size

tools/

sancov/

2 lines

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Lines	public:
// Merge multiple coverage data together.		// Merge multiple coverage data together.
static std::unique_ptr<CoverageData>		static std::unique_ptr<CoverageData>
merge(const std::vector<std::unique_ptr<CoverageData>> &Covs) {		merge(const std::vector<std::unique_ptr<CoverageData>> &Covs) {
std::set<uint64_t> Addrs;		std::set<uint64_t> Addrs;

for (const auto &Cov : Covs)		for (const auto &Cov : Covs)
Addrs.insert(Cov->Addrs->begin(), Cov->Addrs->end());		Addrs.insert(Cov->Addrs->begin(), Cov->Addrs->end());

auto AddrsVector = make_unique<std::vector<uint64_t>>(		auto AddrsVector = llvm::make_unique<std::vector<uint64_t>>(
Addrs.begin(), Addrs.end());		Addrs.begin(), Addrs.end());
return std::unique_ptr<CoverageData>(		return std::unique_ptr<CoverageData>(
new CoverageData(std::move(AddrsVector)));		new CoverageData(std::move(AddrsVector)));
}		}

// Read list of files and merges their coverage info.		// Read list of files and merges their coverage info.
static ErrorOr<std::unique_ptr<CoverageData>>		static ErrorOr<std::unique_ptr<CoverageData>>
readAndMerge(const std::vector<std::string> &FileNames) {		readAndMerge(const std::vector<std::string> &FileNames) {
▲ Show 20 Lines • Show All 110 Lines • Show Last 20 Lines