commit e9eda8a7e60b785e22bda87014ff95dc857a1637
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Mar 09 14:40:03 2017 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Mar 11 13:45:37 2017 -0800
tree d84610ac7de2b310b69079edad6d67b2a2aa2e69
parent f42aa2c05b5cbc73f7f592c4a6cee3f205f84e07

Remove use of deprecated code

Change-Id: Iad490b91ca7e28cbbfbf02a4c83ad6a9223354d4
Refs: #3988

src/socket.hpp

diff --git a/src/socket.hpp b/src/socket.hpp
index d213018..807e173 100644
--- a/src/socket.hpp
+++ b/src/socket.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012-2014 University of California, Los Angeles
+ * Copyright (c) 2012-2017 University of California, Los Angeles
  *
  * This file is part of ChronoSync, synchronization library for distributed realtime
  * applications for NDN.
@@ -64,7 +64,7 @@
          ndn::Face& face,
          const UpdateCallback& updateCallback,
          const Name& signingId = DEFAULT_NAME,
-         ndn::shared_ptr<ndn::Validator> validator = DEFAULT_VALIDATOR);
+         std::shared_ptr<ndn::Validator> validator = DEFAULT_VALIDATOR);
 
   ~Socket();
 
@@ -151,7 +151,7 @@
   fetchData(const Name& sessionName, const SeqNo& seq,
             const ndn::OnDataValidated& onValidated,
             const ndn::OnDataValidationFailed& onValidationFailed,
-            const ndn::OnTimeout& onTimeout,
+            const ndn::TimeoutCallback& onTimeout,
             int nRetries = 0);
 
   /// @brief Get the root digest of current sync tree
@@ -169,7 +169,7 @@
   onInterest(const Name& prefix, const Interest& interest);
 
   void
-  onData(const Interest& interest, Data& data,
+  onData(const Interest& interest, const Data& data,
          const ndn::OnDataValidated& dataCallback,
          const ndn::OnDataValidationFailed& failCallback);
 
@@ -185,7 +185,7 @@
 public:
   static const ndn::Name DEFAULT_NAME;
   static const ndn::Name DEFAULT_PREFIX;
-  static const ndn::shared_ptr<ndn::Validator> DEFAULT_VALIDATOR;
+  static const std::shared_ptr<ndn::Validator> DEFAULT_VALIDATOR;
 
 private:
   typedef std::unordered_map<ndn::Name, const ndn::RegisteredPrefixId*> RegisteredPrefixList;
@@ -196,7 +196,7 @@
 
   ndn::Name m_signingId;
   ndn::KeyChain m_keyChain;
-  ndn::shared_ptr<ndn::Validator> m_validator;
+  std::shared_ptr<ndn::Validator> m_validator;
 
   RegisteredPrefixList m_registeredPrefixList;
   ndn::util::InMemoryStoragePersistent m_ims;