Skip to content

Commit

Permalink
Fixed Boost 1.66.0 compile errors. (#53)
Browse files Browse the repository at this point in the history
  • Loading branch information
redboltz authored and nekipelov committed Feb 9, 2018
1 parent 985caf5 commit d1796f8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions examples/async_timeout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <iostream>
#include <functional>
#include <boost/asio/ip/address.hpp>
#include <boost/asio/deadline_timer.hpp>

#include <redisclient/redisasyncclient.h>

Expand Down
7 changes: 4 additions & 3 deletions src/redisclient/impl/redisclientimpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <boost/asio/ip/tcp.hpp>
#include <boost/asio/local/stream_protocol.hpp>
#include <boost/asio/strand.hpp>
#include <boost/asio/io_service.hpp>

#include <string>
#include <vector>
Expand Down Expand Up @@ -53,8 +54,8 @@ class RedisClientImpl : public std::enable_shared_from_this<RedisClientImpl> {
std::function<void(std::vector<char> msg)> msgHandler,
std::function<void(RedisValue)> handler);

REDIS_CLIENT_DECL void unsubscribe(const std::string &command,
size_t handle_id, const std::string &channel,
REDIS_CLIENT_DECL void unsubscribe(const std::string &command,
size_t handle_id, const std::string &channel,
std::function<void(RedisValue)> handler);

REDIS_CLIENT_DECL void close() noexcept;
Expand Down Expand Up @@ -90,7 +91,7 @@ class RedisClientImpl : public std::enable_shared_from_this<RedisClientImpl> {
inline void post(const Handler &handler);

boost::asio::io_service &ioService;
boost::asio::strand strand;
boost::asio::io_service::strand strand;
boost::asio::generic::stream_protocol::socket socket;
RedisParser redisParser;
boost::array<char, 4096> buf;
Expand Down

0 comments on commit d1796f8

Please sign in to comment.