Skip to content

Commit

Permalink
Switch to Face::getIoContext()
Browse files Browse the repository at this point in the history
Change-Id: I720c876072a23348ece1f42974f5f092b89ac5a0
  • Loading branch information
Pesa committed Nov 11, 2023
1 parent f530be1 commit 74b3a7e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .waf-tools/default-compiler-flags.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"""
Expand Down
4 changes: 2 additions & 2 deletions src/encryptor.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California
* Copyright (c) 2014-2023, Regents of the University of California
*
* NAC library is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
Expand Down Expand Up @@ -45,7 +45,7 @@ Encryptor::Encryptor(const Name& accessPrefix,
, m_onFailure(onFailure)
, m_keyChain(keyChain)
, m_face(face)
, m_scheduler(face.getIoService())
, m_scheduler(face.getIoContext())
{
regenerateCk();

Expand Down

0 comments on commit 74b3a7e

Please sign in to comment.