commit b3d03b98e72d194fbf602b72bf8822b9522e460d
author Varun Patil <varunpatil@ucla.edu> Fri Jan 08 17:09:32 2021 +0530
committer Davide Pesavento <davidepesa@gmail.com> Fri Jan 08 11:43:04 2021 -0500
tree 9f70fe88d1d2374328ab098502c57cae2e671bf6
parent 7676b56b9ed8839ba7c1dcfc49978c44fcbc84b6

build: fix ambiguous calls to std::make_shared

Change-Id: I21cb38bea2eeb265c312acd4a5aa4d2a1b014601

src/contact-storage.cpp

diff --git a/src/contact-storage.cpp b/src/contact-storage.cpp
index 6703f41..9357bed 100644
--- a/src/contact-storage.cpp
+++ b/src/contact-storage.cpp
@@ -1,7 +1,7 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020, Regents of the University of California
- *                     Yingdi Yu
+ * Copyright (c) 2013-2021, Regents of the University of California
+ *                          Yingdi Yu
  *
  * BSD license, See the LICENSE file for more information
  *
@@ -227,7 +227,7 @@
 shared_ptr<Profile>
 ContactStorage::getSelfProfile()
 {
-  shared_ptr<Profile> profile = make_shared<Profile>(m_identity);
+  auto profile = std::make_shared<Profile>(m_identity);
   sqlite3_stmt *stmt;
   sqlite3_prepare_v2(m_db, "SELECT profile_type, profile_value FROM SelfProfile",
                      -1, &stmt, nullptr);
@@ -268,7 +268,7 @@
   sqlite3_bind_string(stmt, 1, m_identity.toUri(), SQLITE_TRANSIENT);
 
   if (sqlite3_step(stmt) == SQLITE_ROW) {
-    cert = make_shared<EndorseCertificate>();
+    cert = std::make_shared<EndorseCertificate>();
     cert->wireDecode(sqlite3_column_block(stmt, 0));
   }
 
@@ -347,7 +347,7 @@
   sqlite3_bind_string(stmt, 1, name.toUri(), SQLITE_TRANSIENT);
 
   if (sqlite3_step(stmt) == SQLITE_ROW) {
-    cert = make_shared<EndorseCertificate>();
+    cert = std::make_shared<EndorseCertificate>();
     cert->wireDecode(sqlite3_column_block(stmt, 1));
   }
 
@@ -481,8 +481,8 @@
       time::fromUnixTimestamp(time::milliseconds(sqlite3_column_int64 (stmt, 4)));
     int isIntroducer = sqlite3_column_int (stmt, 5);
 
-    contact = make_shared<Contact>(identity, alias, Name(keyName),
-                                   notBefore, notAfter, key, isIntroducer);
+    contact = std::make_shared<Contact>(identity, alias, Name(keyName),
+                                        notBefore, notAfter, key, isIntroducer);
   }
   sqlite3_finalize(stmt);
 
@@ -617,7 +617,7 @@
   sqlite3_bind_string(stmt, 1, dataName.toUri(), SQLITE_TRANSIENT);
 
   if (sqlite3_step(stmt) == SQLITE_ROW) {
-    data = make_shared<Data>();
+    data = std::make_shared<Data>();
     data->wireDecode(sqlite3_column_block(stmt, 0));
   }
   sqlite3_finalize(stmt);
@@ -637,7 +637,7 @@
   sqlite3_bind_string(stmt, 2, type, SQLITE_TRANSIENT);
 
   if (sqlite3_step(stmt) == SQLITE_ROW) {
-    data = make_shared<Data>();
+    data = std::make_shared<Data>();
     data->wireDecode(sqlite3_column_block(stmt, 0));
   }
   sqlite3_finalize(stmt);