Skip to content

Commit

Permalink
Refactor most boost pointer related stuff to use their stdlib counter…
Browse files Browse the repository at this point in the history 
…parts instead
  • Loading branch information
@Vultraz
Vultraz committed Jul 24, 2016
1 parent 211ba2e commit cbd3395
Show file tree
Hide file tree
Showing 201 changed files with 703 additions and 766 deletions.
2 changes: 1 addition & 1 deletion src/about.cpp
View file
Expand Up @@ -207,7 +207,7 @@ void set_about(const config &cfg)
*/
void show_about(CVideo &video, const std::string &campaign)
{
boost::scoped_ptr<cursor::setter> cur(new cursor::setter(cursor::WAIT));
std::unique_ptr<cursor::setter> cur(new cursor::setter(cursor::WAIT));
surface& screen = video.getSurface();
if (screen == nullptr) return;

Expand Down
2 changes: 1 addition & 1 deletion src/actions/undo_action.cpp
View file
Expand Up @@ -93,7 +93,7 @@ namespace {
x2 = e.filter_loc2.x + 1; y2 = e.filter_loc2.y + 1;

int realx1 = 0, realy1 = 0, realx2 = 0, realy2 = 0;
boost::scoped_ptr<scoped_xy_unit> u1, u2;
std::unique_ptr<scoped_xy_unit> u1, u2;
if(unit_ptr who = get_unit(e.uid1, e.id1)) {
realx1 = who->get_location().x;
realy1 = who->get_location().y;
Expand Down
4 changes: 2 additions & 2 deletions src/addon/manager_ui.cpp
View file
Expand Up @@ -155,7 +155,7 @@ addon_op_result do_resolve_addon_dependencies(CVideo& v, addons_client& client,
result.outcome = SUCCESS;
result.wml_changed = false;

boost::scoped_ptr<cursor::setter> cursor_setter(new cursor::setter(cursor::WAIT));
std::unique_ptr<cursor::setter> cursor_setter(new cursor::setter(cursor::WAIT));

// TODO: We don't currently check for the need to upgrade. I'll probably
// work on that when implementing dependency tiers later.
Expand Down Expand Up @@ -609,7 +609,7 @@ sorted_addon_pointer_list sort_addons_list(addons_list& addons, ADDON_SORT sort,

void show_addons_manager_dialog(CVideo& v, addons_client& client, addons_list& addons, std::string& last_addon_id, bool& stay_in_ui, bool& wml_changed, addons_filter_state& filter)
{
boost::scoped_ptr<cursor::setter> cursor_setter(new cursor::setter(cursor::WAIT));
std::unique_ptr<cursor::setter> cursor_setter(new cursor::setter(cursor::WAIT));

stay_in_ui = false;
filter.changed = false;
Expand Down
2 changes: 1 addition & 1 deletion src/ai/actions.cpp
View file
Expand Up @@ -383,7 +383,7 @@ bool move_result::test_route(const unit &un)
pathfind::teleport_map allowed_teleports = pathfind::get_teleport_locations(un, my_team, true);///@todo 1.9: see_all -> false

//do an A*-search
route_ = boost::shared_ptr<pathfind::plain_route>( new pathfind::plain_route(pathfind::a_star_search(un.get_location(), to_, 10000.0, &calc, resources::gameboard->map().w(), resources::gameboard->map().h(), &allowed_teleports)));
route_ = std::shared_ptr<pathfind::plain_route>( new pathfind::plain_route(pathfind::a_star_search(un.get_location(), to_, 10000.0, &calc, resources::gameboard->map().w(), resources::gameboard->map().h(), &allowed_teleports)));
if (route_->steps.empty()) {
set_error(E_NO_ROUTE);
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/ai/actions.hpp
View file
Expand Up @@ -196,7 +196,7 @@ class move_result : public action_result {
const map_location from_;
const map_location to_;
bool remove_movement_;
boost::shared_ptr<pathfind::plain_route> route_;
std::shared_ptr<pathfind::plain_route> route_;
map_location unit_location_;
bool unreach_is_ok_;
bool has_ambusher_;
Expand Down
56 changes: 28 additions & 28 deletions src/ai/composite/aspect.hpp
View file
Expand Up @@ -56,7 +56,7 @@ class aspect : public readonly_context_proxy, public events::observer, public co
virtual const variant& get_variant() const = 0;


virtual boost::shared_ptr<variant> get_variant_ptr() const = 0;
virtual std::shared_ptr<variant> get_variant_ptr() const = 0;


virtual void recalculate() const = 0;
Expand Down Expand Up @@ -139,19 +139,19 @@ class typesafe_aspect : public aspect {
return *get_variant_ptr();
}

virtual boost::shared_ptr<variant> get_variant_ptr() const
virtual std::shared_ptr<variant> get_variant_ptr() const
{
if (!valid_variant_) {
if (!valid_) {
recalculate();
}

if (!valid_variant_ && valid_ ) {
value_variant_ = boost::shared_ptr<variant>(new variant(variant_value_translator<T>::value_to_variant(this->get())));
value_variant_ = std::shared_ptr<variant>(new variant(variant_value_translator<T>::value_to_variant(this->get())));
valid_variant_ = true;
} else if (!valid_variant_ && valid_lua_) {
value_ = value_lua_->get();
value_variant_ = boost::shared_ptr<variant>(new variant(variant_value_translator<T>::value_to_variant(this->get())));
value_variant_ = std::shared_ptr<variant>(new variant(variant_value_translator<T>::value_to_variant(this->get())));
valid_variant_ = true; // @note: temporary workaround
} else {
assert(valid_variant_);
Expand All @@ -163,7 +163,7 @@ class typesafe_aspect : public aspect {
virtual void recalculate() const = 0;


virtual boost::shared_ptr<T> get_ptr() const
virtual std::shared_ptr<T> get_ptr() const
{
if (!valid_) {
if (!(valid_variant_ || valid_lua_)) {
Expand All @@ -172,7 +172,7 @@ class typesafe_aspect : public aspect {

if (!valid_ ) {
if (valid_variant_) {
value_ = boost::shared_ptr<T>(new T(variant_value_translator<T>::variant_to_value(get_variant())));
value_ = std::shared_ptr<T>(new T(variant_value_translator<T>::variant_to_value(get_variant())));
valid_ = true;
} else if (valid_lua_){
value_ = value_lua_->get();
Expand All @@ -186,9 +186,9 @@ class typesafe_aspect : public aspect {
}

protected:
mutable boost::shared_ptr<T> value_;
mutable boost::shared_ptr<variant> value_variant_;
mutable boost::shared_ptr< lua_object<T> > value_lua_;
mutable std::shared_ptr<T> value_;
mutable std::shared_ptr<variant> value_variant_;
mutable std::shared_ptr< lua_object<T> > value_lua_;
};


Expand Down Expand Up @@ -219,14 +219,14 @@ class composite_aspect;
template<typename T>
class typesafe_known_aspect : public known_aspect {
public:
typesafe_known_aspect(const std::string &name, boost::shared_ptr< typesafe_aspect<T> > &where, aspect_map &aspects)
typesafe_known_aspect(const std::string &name, std::shared_ptr< typesafe_aspect<T> > &where, aspect_map &aspects)
: known_aspect(name), where_(where), aspects_(aspects)
{
}

void set(aspect_ptr a)
{
boost::shared_ptr< typesafe_aspect <T> > c = boost::dynamic_pointer_cast< typesafe_aspect<T> >(a);
std::shared_ptr< typesafe_aspect <T> > c = std::dynamic_pointer_cast< typesafe_aspect<T> >(a);
if (c) {
assert (c->get_id()== this->get_name());
where_ = c;
Expand All @@ -238,7 +238,7 @@ class typesafe_known_aspect : public known_aspect {

virtual void add_facet(const config &cfg)
{
boost::shared_ptr< composite_aspect <T> > c = boost::dynamic_pointer_cast< composite_aspect<T> >(where_);
std::shared_ptr< composite_aspect <T> > c = std::dynamic_pointer_cast< composite_aspect<T> >(where_);
if (c) {
assert (c->get_id()==this->get_name());
c->add_facet(-1, cfg);
Expand All @@ -249,7 +249,7 @@ class typesafe_known_aspect : public known_aspect {
}

protected:
boost::shared_ptr<typesafe_aspect <T> > &where_;
std::shared_ptr<typesafe_aspect <T> > &where_;
aspect_map &aspects_;

};
Expand All @@ -275,7 +275,7 @@ class composite_aspect : public typesafe_aspect<T> {
std::vector< aspect_ptr > default_aspects;
engine::parse_aspect_from_config(*this,_default,parent_id_,std::back_inserter(default_aspects));
if (!default_aspects.empty()) {
typename aspect_type<T>::typesafe_ptr b = boost::dynamic_pointer_cast< typesafe_aspect<T> >(default_aspects.front());
typename aspect_type<T>::typesafe_ptr b = std::dynamic_pointer_cast< typesafe_aspect<T> >(default_aspects.front());
if (composite_aspect<T>* c = dynamic_cast<composite_aspect<T>*>(b.get())) {
c->parent_id_ = parent_id_;
}
Expand All @@ -296,7 +296,7 @@ class composite_aspect : public typesafe_aspect<T> {
std::vector<aspect_ptr> facets_base;
engine::parse_aspect_from_config(*this,cfg,parent_id_,std::back_inserter(facets_base));
for (aspect_ptr a : facets_base) {
typename aspect_type<T>::typesafe_ptr b = boost::dynamic_pointer_cast< typesafe_aspect<T> > (a);
typename aspect_type<T>::typesafe_ptr b = std::dynamic_pointer_cast< typesafe_aspect<T> > (a);
if (composite_aspect<T>* c = dynamic_cast<composite_aspect<T>*>(b.get())) {
c->parent_id_ = parent_id_;
}
Expand All @@ -310,13 +310,13 @@ class composite_aspect : public typesafe_aspect<T> {
///@todo 1.9 optimize in case of an aspect which returns variant
for (const typename aspect_type<T>::typesafe_ptr &f : make_pair(facets_.rbegin(),facets_.rend())) {
if (f->active()) {
this->value_ = boost::shared_ptr<T>(f->get_ptr());
this->value_ = std::shared_ptr<T>(f->get_ptr());
this->valid_ = true;
return;
}
}
if (default_) {
this->value_ = boost::shared_ptr<T>(default_->get_ptr());
this->value_ = std::shared_ptr<T>(default_->get_ptr());
this->valid_ = true;
}
}
Expand Down Expand Up @@ -345,7 +345,7 @@ class composite_aspect : public typesafe_aspect<T> {
engine::parse_aspect_from_config(*this,cfg,parent_id_,std::back_inserter(facets));
int j=0;
for (aspect_ptr a : facets) {
typename aspect_type<T>::typesafe_ptr b = boost::dynamic_pointer_cast< typesafe_aspect<T> > (a);
typename aspect_type<T>::typesafe_ptr b = std::dynamic_pointer_cast< typesafe_aspect<T> > (a);
if (composite_aspect<T>* c = dynamic_cast<composite_aspect<T>*>(b.get())) {
c->parent_id_ = parent_id_;
}
Expand Down Expand Up @@ -377,7 +377,7 @@ class standard_aspect : public typesafe_aspect<T> {
: typesafe_aspect<T>(context, cfg, id)
{
this->name_ = "standard_aspect";
boost::shared_ptr<T> value(new T(config_value_translator<T>::cfg_to_value(this->cfg_)));
std::shared_ptr<T> value(new T(config_value_translator<T>::cfg_to_value(this->cfg_)));
this->value_= value;
LOG_STREAM(debug, aspect::log()) << "standard aspect has value: "<< std::endl << config_value_translator<T>::value_to_cfg(this->get()) << std::endl;
}
Expand Down Expand Up @@ -415,7 +415,7 @@ template<typename T>
class lua_aspect : public typesafe_aspect<T>
{
public:
lua_aspect(readonly_context &context, const config &cfg, const std::string &id, boost::shared_ptr<lua_ai_context>& l_ctx)
lua_aspect(readonly_context &context, const config &cfg, const std::string &id, std::shared_ptr<lua_ai_context>& l_ctx)
: typesafe_aspect<T>(context, cfg, id)
, handler_(), code_(), params_(cfg.child_or_empty("args"))
{
Expand All @@ -433,7 +433,7 @@ class lua_aspect : public typesafe_aspect<T>
// error
return;
}
handler_ = boost::shared_ptr<lua_ai_action_handler>(resources::lua_kernel->create_lua_ai_action_handler(code_.c_str(), *l_ctx));
handler_ = std::shared_ptr<lua_ai_action_handler>(resources::lua_kernel->create_lua_ai_action_handler(code_.c_str(), *l_ctx));
}

void recalculate() const
Expand All @@ -454,7 +454,7 @@ class lua_aspect : public typesafe_aspect<T>
}

private:
boost::shared_ptr<lua_ai_action_handler> handler_;
std::shared_ptr<lua_ai_action_handler> handler_;
std::string code_;
const config params_;
};
Expand All @@ -463,7 +463,7 @@ class lua_aspect : public typesafe_aspect<T>
class aspect_factory{
bool is_duplicate(const std::string &name);
public:
typedef boost::shared_ptr< aspect_factory > factory_ptr;
typedef std::shared_ptr< aspect_factory > factory_ptr;
typedef std::map<std::string, factory_ptr> factory_map;
typedef std::pair<const std::string, factory_ptr> factory_map_pair;

Expand Down Expand Up @@ -500,7 +500,7 @@ class register_aspect_factory : public aspect_factory {

aspect_ptr get_new_instance( readonly_context &context, const config &cfg, const std::string &id)
{
boost::shared_ptr<ASPECT> _a(new ASPECT(context,cfg,id));
std::shared_ptr<ASPECT> _a(new ASPECT(context,cfg,id));
aspect_ptr a = _a;
a->on_create();
return a;
Expand All @@ -509,7 +509,7 @@ class register_aspect_factory : public aspect_factory {

class lua_aspect_factory{
public:
typedef boost::shared_ptr< lua_aspect_factory > factory_ptr;
typedef std::shared_ptr< lua_aspect_factory > factory_ptr;
typedef std::map<std::string, factory_ptr> factory_map;
typedef std::pair<const std::string, factory_ptr> factory_map_pair;

Expand All @@ -521,7 +521,7 @@ class lua_aspect_factory{
return *aspect_factories;
}

virtual aspect_ptr get_new_instance( readonly_context &context, const config &cfg, const std::string &id, boost::shared_ptr<lua_ai_context>& l_ctx) = 0;
virtual aspect_ptr get_new_instance( readonly_context &context, const config &cfg, const std::string &id, std::shared_ptr<lua_ai_context>& l_ctx) = 0;

lua_aspect_factory( const std::string &name )
{
Expand All @@ -540,9 +540,9 @@ class register_lua_aspect_factory : public lua_aspect_factory {
{
}

aspect_ptr get_new_instance( readonly_context &context, const config &cfg, const std::string &id, boost::shared_ptr<lua_ai_context>& l_ctx)
aspect_ptr get_new_instance( readonly_context &context, const config &cfg, const std::string &id, std::shared_ptr<lua_ai_context>& l_ctx)
{
boost::shared_ptr<ASPECT> _a(new ASPECT(context,cfg,id,l_ctx));
std::shared_ptr<ASPECT> _a(new ASPECT(context,cfg,id,l_ctx));
aspect_ptr a = _a;
a->on_create();
return a;
Expand Down
2 changes: 1 addition & 1 deletion src/ai/composite/component.hpp
View file
Expand Up @@ -53,7 +53,7 @@ struct path_element {
};

class base_property_handler;
typedef boost::shared_ptr<base_property_handler> property_handler_ptr;
typedef std::shared_ptr<base_property_handler> property_handler_ptr;
typedef std::map<std::string,property_handler_ptr> property_handler_map;

class component {
Expand Down
2 changes: 1 addition & 1 deletion src/ai/composite/engine.hpp
View file
Expand Up @@ -118,7 +118,7 @@ class engine_factory;
class engine_factory{
bool is_duplicate(const std::string &name);
public:
typedef boost::shared_ptr< engine_factory > factory_ptr;
typedef std::shared_ptr< engine_factory > factory_ptr;
typedef std::map<std::string, factory_ptr> factory_map;
typedef std::pair<const std::string, factory_ptr> factory_map_pair;

Expand Down
14 changes: 7 additions & 7 deletions src/ai/composite/goal.cpp
View file
Expand Up @@ -59,7 +59,7 @@ void goal::on_create()
LOG_AI_GOAL << "side " << get_side() << " : " << " created goal with name=[" << cfg_["name"] << "]" << std::endl;
}

void goal::on_create(boost::shared_ptr<ai::lua_ai_context>)
void goal::on_create(std::shared_ptr<ai::lua_ai_context>)
{
unrecognized();
}
Expand Down Expand Up @@ -188,7 +188,7 @@ void target_location_goal::on_create()
}
const config &criteria = cfg_.child("criteria");
if (criteria) {
filter_ptr_ = boost::shared_ptr<terrain_filter>(new terrain_filter(vconfig(criteria),resources::filter_con));
filter_ptr_ = std::shared_ptr<terrain_filter>(new terrain_filter(vconfig(criteria),resources::filter_con));
}
}

Expand Down Expand Up @@ -249,7 +249,7 @@ void protect_goal::on_create()
}
const config &criteria = cfg_.child("criteria");
if (criteria) {
filter_ptr_ = boost::shared_ptr<terrain_filter>(new terrain_filter(vconfig(criteria),resources::filter_con));
filter_ptr_ = std::shared_ptr<terrain_filter>(new terrain_filter(vconfig(criteria),resources::filter_con));
}


Expand Down Expand Up @@ -339,15 +339,15 @@ lua_goal::lua_goal(readonly_context &context, const config &cfg)
}
}

void lua_goal::on_create(boost::shared_ptr<ai::lua_ai_context> l_ctx)
void lua_goal::on_create(std::shared_ptr<ai::lua_ai_context> l_ctx)
{
handler_ = boost::shared_ptr<lua_ai_action_handler>(resources::lua_kernel->create_lua_ai_action_handler(code_.c_str(), *l_ctx));
handler_ = std::shared_ptr<lua_ai_action_handler>(resources::lua_kernel->create_lua_ai_action_handler(code_.c_str(), *l_ctx));
}

void lua_goal::add_targets(std::back_insert_iterator< std::vector< target > > target_list)
{
boost::shared_ptr< lua_object< std::vector < target > > > l_obj
= boost::shared_ptr< lua_object< std::vector < target > > >(new lua_object< std::vector < target > >());
std::shared_ptr< lua_object< std::vector < target > > > l_obj
= std::shared_ptr< lua_object< std::vector < target > > >(new lua_object< std::vector < target > >());
config c(cfg_.child_or_empty("args"));
handler_->handle(c, true, l_obj);
try {
Expand Down
12 changes: 6 additions & 6 deletions src/ai/composite/goal.hpp
View file
Expand Up @@ -65,7 +65,7 @@ class goal : public readonly_context_proxy, public component {


virtual void on_create();
virtual void on_create(boost::shared_ptr<ai::lua_ai_context>);
virtual void on_create(std::shared_ptr<ai::lua_ai_context>);


bool active() const;
Expand Down Expand Up @@ -120,7 +120,7 @@ class target_location_goal : public goal {
{
return value_;
}
boost::shared_ptr<terrain_filter> filter_ptr_;
std::shared_ptr<terrain_filter> filter_ptr_;
double value_;
};

Expand All @@ -142,7 +142,7 @@ class protect_goal : public goal {
return value_;
}

boost::shared_ptr<terrain_filter> filter_ptr_;
std::shared_ptr<terrain_filter> filter_ptr_;
bool protect_unit_;
int radius_;
double value_;
Expand Down Expand Up @@ -170,18 +170,18 @@ class lua_goal : public goal {
public:
lua_goal(readonly_context& context, const config& cfg);
virtual void add_targets(std::back_insert_iterator< std::vector< target > > target_list);
void on_create(boost::shared_ptr<ai::lua_ai_context>);
void on_create(std::shared_ptr<ai::lua_ai_context>);

private:
std::string code_;
boost::shared_ptr<lua_ai_action_handler> handler_;
std::shared_ptr<lua_ai_action_handler> handler_;
};


class goal_factory{
bool is_duplicate(const std::string &name);
public:
typedef boost::shared_ptr< goal_factory > factory_ptr;
typedef std::shared_ptr< goal_factory > factory_ptr;
typedef std::map<std::string, factory_ptr> factory_map;
typedef std::pair<const std::string, factory_ptr> factory_map_pair;

Expand Down

0 comments on commit cbd3395

Please sign in to comment.