Merge remote-tracking branch 'origin/stable' into debian/buster

This commit is contained in:
Jason Rhinelander 2021-11-30 14:31:53 -04:00
commit f04b0fc7c6
1 changed files with 1 additions and 4 deletions

View File

@ -44,6 +44,7 @@
#include <atomic>
#include <cassert>
#include <cstdint>
#include <future>
#include "zmq.hpp"
#include "address.h"
#include "bt_serialize.h"
@ -56,10 +57,6 @@
#error "ZMQ >= 4.3.0 required"
#endif
namespace std {
template <class R> class promise;
}
namespace oxenmq {
using namespace std::literals;