Skip to content

Replacing boost::bind and boost::enable_shared_form_this by std counterparts #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 14, 2013
Merged

Replacing boost::bind and boost::enable_shared_form_this by std counterparts #230

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0dc7308
Remove boost::bind/shared_ptr from client
deanberris Apr 8, 2013
078542e
replacing boost::enable_shared_from_this by its std counterpart
torbjoernk Apr 13, 2013
a5cb138
replacing boost::bind by std::bind
torbjoernk Apr 13, 2013
358a035
also replaced boost::bind by std::bind in test cases now
torbjoernk Apr 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
replacing boost::enable_shared_from_this by its std counterpart
  • Loading branch information
@torbjoernk
torbjoernk committed Apr 13, 2013
commit 078542ebf36b97a6445573b7b877b411bd3576f4
2 changes: 1 addition & 1 deletion contrib/http_examples/http/fileserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ struct file_cache {

};

struct connection_handler : boost::enable_shared_from_this<connection_handler> {
struct connection_handler : std::enable_shared_from_this<connection_handler> {
explicit connection_handler(file_cache& cache) : file_cache_(cache) {}

void operator()(std::string const& path,
Expand Down
4 changes: 2 additions & 2 deletions http/src/network/protocol/http/policies/async_connection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/cstdint.hpp>
#include <boost/enable_shared_from_this.hpp>
// #include <boost/enable_shared_from_this.hpp>
#include <boost/tuple/tuple.hpp>
#include <functional>
#include <functional>
Expand Down Expand Up @@ -47,7 +47,7 @@ struct simple_async_connection_manager : connection_manager {
struct http_1_1_async_connection;

struct http_1_1_async_connection_manager : connection_manager,
enable_shared_from_this<http_1_1_async_connection_manager> {
std::enable_shared_from_this<http_1_1_async_connection_manager> {
http_1_1_async_connection_manager(bool cache_resolved,
bool follow_redirects,
optional<std::string> openssl_certificate,
Expand Down
4 changes: 2 additions & 2 deletions http/src/network/protocol/http/server/connection/sync.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include <utility>
#include <iterator>
#include <boost/enable_shared_from_this.hpp>
// #include <boost/enable_shared_from_this.hpp>
#include <network/constants.hpp>
#include <network/protocol/http/server/request_parser.hpp>
#include <network/protocol/http/request.hpp>
Expand Down Expand Up @@ -43,7 +43,7 @@ extern void parse_headers(
#endif

class sync_server_connection
: public boost::enable_shared_from_this<sync_server_connection> {
: public std::enable_shared_from_this<sync_server_connection> {
public:
sync_server_connection(boost::asio::io_service& service,
std::function<void(request const&, response&)> handler)
Expand Down