shared_ptr -> std::shared_ptr
This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today.
This commit is contained in:
@@ -97,7 +97,7 @@ namespace boost {
|
||||
void set_controlling(bool control = true)
|
||||
{ controlling_connection = control; }
|
||||
|
||||
shared_ptr<BOOST_SIGNALS_NAMESPACE::detail::basic_connection>
|
||||
std::shared_ptr<BOOST_SIGNALS_NAMESPACE::detail::basic_connection>
|
||||
get_connection() const
|
||||
{ return con; }
|
||||
|
||||
@@ -115,7 +115,7 @@ namespace boost {
|
||||
friend class BOOST_SIGNALS_NAMESPACE::detail::bound_objects_visitor;
|
||||
|
||||
// Pointer to the actual contents of the connection
|
||||
shared_ptr<BOOST_SIGNALS_NAMESPACE::detail::basic_connection> con;
|
||||
std::shared_ptr<BOOST_SIGNALS_NAMESPACE::detail::basic_connection> con;
|
||||
|
||||
// True if the destruction of this connection object should disconnect
|
||||
bool controlling_connection;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <boost/signals/detail/signals_common.hpp>
|
||||
#include <boost/signals/connection.hpp>
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/std::shared_ptr.hpp>
|
||||
#include <boost/function/function2.hpp>
|
||||
#include <boost/iterator/iterator_facade.hpp>
|
||||
#include <map>
|
||||
@@ -45,7 +45,7 @@ class stored_group
|
||||
|
||||
private:
|
||||
storage_kind kind;
|
||||
shared_ptr<void> group;
|
||||
std::shared_ptr<void> group;
|
||||
};
|
||||
|
||||
typedef function2<bool, stored_group, stored_group> compare_type;
|
||||
@@ -60,7 +60,7 @@ public:
|
||||
typedef const stored_group& first_argument_type;
|
||||
typedef const stored_group& second_argument_type;
|
||||
|
||||
group_bridge_compare(const Compare& c) : comp(c)
|
||||
group_bridge_compare(const Compare& c) : comp(c)
|
||||
{ }
|
||||
|
||||
bool operator()(const stored_group& k1, const stored_group& k2) const
|
||||
@@ -93,15 +93,15 @@ class BOOST_SIGNALS_DECL named_slot_map_iterator :
|
||||
connection_slot_pair,
|
||||
forward_traversal_tag> inherited;
|
||||
public:
|
||||
named_slot_map_iterator() : slot_assigned(false)
|
||||
named_slot_map_iterator() : slot_assigned(false)
|
||||
{ }
|
||||
named_slot_map_iterator(const named_slot_map_iterator& other)
|
||||
named_slot_map_iterator(const named_slot_map_iterator& other)
|
||||
: group(other.group), last_group(other.last_group),
|
||||
slot_assigned(other.slot_assigned)
|
||||
{
|
||||
if (slot_assigned) slot_ = other.slot_;
|
||||
}
|
||||
named_slot_map_iterator& operator=(const named_slot_map_iterator& other)
|
||||
named_slot_map_iterator& operator=(const named_slot_map_iterator& other)
|
||||
{
|
||||
slot_assigned = other.slot_assigned;
|
||||
group = other.group;
|
||||
@@ -109,11 +109,11 @@ public:
|
||||
if (slot_assigned) slot_ = other.slot_;
|
||||
return *this;
|
||||
}
|
||||
connection_slot_pair& dereference() const
|
||||
connection_slot_pair& dereference() const
|
||||
{
|
||||
return *slot_;
|
||||
}
|
||||
void increment()
|
||||
void increment()
|
||||
{
|
||||
++slot_;
|
||||
if (slot_ == group->second.end()) {
|
||||
|
||||
@@ -33,10 +33,10 @@ namespace boost {
|
||||
// manages call depth
|
||||
class BOOST_SIGNALS_DECL call_notification {
|
||||
public:
|
||||
call_notification(const shared_ptr<signal_base_impl>&);
|
||||
call_notification(const std::shared_ptr<signal_base_impl>&);
|
||||
~call_notification();
|
||||
|
||||
shared_ptr<signal_base_impl> impl;
|
||||
std::shared_ptr<signal_base_impl> impl;
|
||||
};
|
||||
|
||||
// Implementation of base class for all signals. It handles the
|
||||
@@ -87,7 +87,7 @@ namespace boost {
|
||||
|
||||
connection connect_slot(const any& slot,
|
||||
const stored_group& name,
|
||||
shared_ptr<slot_base::data_t> data,
|
||||
std::shared_ptr<slot_base::data_t> data,
|
||||
connect_position at);
|
||||
|
||||
private:
|
||||
@@ -138,7 +138,7 @@ namespace boost {
|
||||
protected:
|
||||
connection connect_slot(const any& slot,
|
||||
const stored_group& name,
|
||||
shared_ptr<slot_base::data_t> data,
|
||||
std::shared_ptr<slot_base::data_t> data,
|
||||
connect_position at)
|
||||
{
|
||||
return impl->connect_slot(slot, name, data, at);
|
||||
@@ -146,7 +146,7 @@ namespace boost {
|
||||
|
||||
typedef named_slot_map::iterator iterator;
|
||||
|
||||
shared_ptr<signal_base_impl> impl;
|
||||
std::shared_ptr<signal_base_impl> impl;
|
||||
};
|
||||
} // end namespace detail
|
||||
} // end namespace BOOST_SIGNALS_NAMESPACE
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <boost/signals/connection.hpp>
|
||||
#include <boost/signals/trackable.hpp>
|
||||
#include <boost/visit_each.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/std::shared_ptr.hpp>
|
||||
#include <cassert>
|
||||
|
||||
#ifdef BOOST_HAS_ABI_HEADERS
|
||||
@@ -33,7 +33,7 @@ namespace boost {
|
||||
std::vector<const trackable*> bound_objects;
|
||||
connection watch_bound_objects;
|
||||
};
|
||||
shared_ptr<data_t> get_data() const { return data; }
|
||||
std::shared_ptr<data_t> get_data() const { return data; }
|
||||
|
||||
// Get the set of bound objects
|
||||
std::vector<const trackable*>& get_bound_objects() const
|
||||
@@ -41,14 +41,14 @@ namespace boost {
|
||||
|
||||
// Determine if this slot is still "active", i.e., all of the bound
|
||||
// objects still exist
|
||||
bool is_active() const
|
||||
bool is_active() const
|
||||
{ return data->watch_bound_objects.connected(); }
|
||||
|
||||
protected:
|
||||
// Create a connection for this slot
|
||||
void create_connection();
|
||||
|
||||
shared_ptr<data_t> data;
|
||||
std::shared_ptr<data_t> data;
|
||||
|
||||
private:
|
||||
static void bound_object_destructed(void*, void*) {}
|
||||
@@ -116,9 +116,9 @@ namespace boost {
|
||||
// An exception thrown here will allow the basic_connection to be
|
||||
// destroyed when this goes out of scope, and no other connections
|
||||
// have been made.
|
||||
BOOST_SIGNALS_NAMESPACE::detail::bound_objects_visitor
|
||||
BOOST_SIGNALS_NAMESPACE::detail::bound_objects_visitor
|
||||
do_bind(this->data->bound_objects);
|
||||
visit_each(do_bind,
|
||||
visit_each(do_bind,
|
||||
BOOST_SIGNALS_NAMESPACE::get_inspectable_slot
|
||||
(f, BOOST_SIGNALS_NAMESPACE::tag_type(f)));
|
||||
create_connection();
|
||||
|
||||
Reference in New Issue
Block a user