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/chatroom-discovery-backend.cpp

diff --git a/src/chatroom-discovery-backend.cpp b/src/chatroom-discovery-backend.cpp
index 8e2ad21..504a4c2 100644
--- a/src/chatroom-discovery-backend.cpp
+++ b/src/chatroom-discovery-backend.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020, Regents of the University of California
+ * Copyright (c) 2013-2021, Regents of the University of California
  *
  * BSD license, See the LICENSE file for more information
  *
@@ -99,11 +99,11 @@
   m_face = shared_ptr<ndn::Face>(new ndn::Face);
   m_scheduler = unique_ptr<ndn::Scheduler>(new ndn::Scheduler(m_face->getIoService()));
 
-  m_sock = make_shared<chronosync::Socket>(m_discoveryPrefix,
-                                           Name(),
-                                           ref(*m_face),
-                                           bind(&ChatroomDiscoveryBackend::processSyncUpdate,
-                                                this, _1));
+  m_sock = std::make_shared<chronosync::Socket>(m_discoveryPrefix,
+                                                Name(),
+                                                ref(*m_face),
+                                                bind(&ChatroomDiscoveryBackend::processSyncUpdate,
+                                                     this, _1));
 
   // add an timer to refresh front end
   m_refreshPanelId = m_scheduler->schedule(REFRESH_INTERVAL,