From d45f888b9ae96acefc452ef1cef5d505318c4fbf Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sat, 11 Nov 2023 17:32:23 -0500 Subject: [PATCH] Switch to Face::getIoContext() Change-Id: I6c5242ead4dc6d5d37c0fa77c3e68a55d60a87bc --- .waf-tools/default-compiler-flags.py | 6 +++++- src/logic.cpp | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py index 4aa9e9b..bee5072 100644 --- a/.waf-tools/default-compiler-flags.py +++ b/.waf-tools/default-compiler-flags.py @@ -128,7 +128,11 @@ def getCompilerVersion(self, conf): def getGeneralFlags(self, conf): """Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are always needed""" - return {'CXXFLAGS': [], 'LINKFLAGS': [], 'DEFINES': []} + return { + 'CXXFLAGS': [], + 'LINKFLAGS': [], + 'DEFINES': ['BOOST_ASIO_NO_DEPRECATED', 'BOOST_FILESYSTEM_NO_DEPRECATED'], + } def getDebugFlags(self, conf): """Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are needed only in debug mode""" diff --git a/src/logic.cpp b/src/logic.cpp index c2ca8f8..d93db65 100644 --- a/src/logic.cpp +++ b/src/logic.cpp @@ -1,6 +1,6 @@ /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2012-2022 University of California, Los Angeles + * Copyright (c) 2012-2023 University of California, Los Angeles * * This file is part of ChronoSync, synchronization library for distributed realtime * applications for NDN. @@ -101,11 +101,11 @@ Logic::Logic(ndn::Face& face, , m_syncPrefix(syncPrefix) , m_syncReset(Name(syncPrefix).append("reset")) , m_defaultUserPrefix(defaultUserPrefix) - , m_interestTable(m_face.getIoService()) + , m_interestTable(m_face.getIoContext()) , m_isInReset(false) , m_needPeriodReset(resetTimer > time::nanoseconds::zero()) , m_onUpdate(onUpdate) - , m_scheduler(m_face.getIoService()) + , m_scheduler(m_face.getIoContext()) , m_rng(ndn::random::getRandomNumberEngine()) , m_rangeUniformRandom(100, 500) , m_reexpressionJitter(100, 500)