diff --git a/src/ai/actions.cpp b/src/ai/actions.cpp index 22796a92307..93cf45125f8 100644 --- a/src/ai/actions.cpp +++ b/src/ai/actions.cpp @@ -384,7 +384,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_ = std::shared_ptr( 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_.reset(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; diff --git a/src/ai/composite/aspect.hpp b/src/ai/composite/aspect.hpp index b6ba39f4842..ac79968d614 100644 --- a/src/ai/composite/aspect.hpp +++ b/src/ai/composite/aspect.hpp @@ -146,11 +146,11 @@ public: } if (!valid_variant_ && valid_ ) { - value_variant_ = std::shared_ptr(new wfl::variant(variant_value_translator::value_to_variant(this->get()))); + value_variant_.reset(new wfl::variant(variant_value_translator::value_to_variant(this->get()))); valid_variant_ = true; } else if (!valid_variant_ && valid_lua_) { value_ = value_lua_->get(); - value_variant_ = std::shared_ptr(new wfl::variant(variant_value_translator::value_to_variant(this->get()))); + value_variant_.reset(new wfl::variant(variant_value_translator::value_to_variant(this->get()))); valid_variant_ = true; // @note: temporary workaround } else { assert(valid_variant_); @@ -171,7 +171,7 @@ public: if (!valid_ ) { if (valid_variant_) { - value_ = std::shared_ptr(new T(variant_value_translator::variant_to_value(get_variant()))); + value_.reset(new T(variant_value_translator::variant_to_value(get_variant()))); valid_ = true; } else if (valid_lua_){ value_ = value_lua_->get(); @@ -309,13 +309,13 @@ public: ///@todo 1.9 optimize in case of an aspect which returns variant for(const auto& f : boost::adaptors::reverse(facets_)) { if (f->active()) { - this->value_ = std::shared_ptr(f->get_ptr()); + this->value_ = f->get_ptr(); this->valid_ = true; return; } } if (default_) { - this->value_ = std::shared_ptr(default_->get_ptr()); + this->value_ = default_->get_ptr(); this->valid_ = true; } } @@ -442,7 +442,7 @@ public: // error return; } - handler_ = std::shared_ptr(resources::lua_kernel->create_lua_ai_action_handler(code_.c_str(), *l_ctx)); + handler_.reset(resources::lua_kernel->create_lua_ai_action_handler(code_.c_str(), *l_ctx)); } void recalculate() const diff --git a/src/ai/composite/goal.cpp b/src/ai/composite/goal.cpp index b48dd562efa..97804b2bf29 100644 --- a/src/ai/composite/goal.cpp +++ b/src/ai/composite/goal.cpp @@ -177,7 +177,7 @@ void target_location_goal::on_create() } const config &criteria = cfg_.child("criteria"); if (criteria) { - filter_ptr_ = std::shared_ptr(new terrain_filter(vconfig(criteria),resources::filter_con)); + filter_ptr_.reset(new terrain_filter(vconfig(criteria),resources::filter_con)); } } @@ -228,7 +228,7 @@ void protect_goal::on_create() } const config &criteria = cfg_.child("criteria"); if (criteria) { - filter_ptr_ = std::shared_ptr(new terrain_filter(vconfig(criteria),resources::filter_con)); + filter_ptr_.reset(new terrain_filter(vconfig(criteria),resources::filter_con)); } @@ -320,13 +320,12 @@ lua_goal::lua_goal(readonly_context &context, const config &cfg) void lua_goal::on_create(std::shared_ptr l_ctx) { - handler_ = std::shared_ptr(resources::lua_kernel->create_lua_ai_action_handler(code_.c_str(), *l_ctx)); + handler_.reset(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) { - std::shared_ptr< lua_object< std::vector < target > > > l_obj - = std::shared_ptr< lua_object< std::vector < target > > >(new lua_object< std::vector < target > >()); + std::shared_ptr>> l_obj = std::make_shared>>(); config c(cfg_.child_or_empty("args")); handler_->handle(c, true, l_obj); try { diff --git a/src/ai/default/aspect_attacks.cpp b/src/ai/default/aspect_attacks.cpp index 126ec8c99fe..9aadcc07427 100644 --- a/src/ai/default/aspect_attacks.cpp +++ b/src/ai/default/aspect_attacks.cpp @@ -435,7 +435,7 @@ aspect_attacks_lua::aspect_attacks_lua(readonly_context &context, const config & // error return; } - handler_ = std::shared_ptr(resources::lua_kernel->create_lua_ai_action_handler(code_.c_str(), *l_ctx)); + handler_.reset(resources::lua_kernel->create_lua_ai_action_handler(code_.c_str(), *l_ctx)); } void aspect_attacks_lua::recalculate() const diff --git a/src/ai/manager.cpp b/src/ai/manager.cpp index 7b1bc2143c0..bbe33c35f35 100644 --- a/src/ai/manager.cpp +++ b/src/ai/manager.cpp @@ -97,7 +97,7 @@ void holder::init( side_number side ) default_ai_context_.reset(new default_ai_context_impl(*readwrite_context_,cfg_)); } if (!this->ai_){ - ai_ = std::shared_ptr(new ai_composite(*default_ai_context_,cfg_)); + ai_.reset(new ai_composite(*default_ai_context_,cfg_)); } if (this->ai_) { diff --git a/src/formula/function.cpp b/src/formula/function.cpp index 7d71750e71d..8a32c0b33ae 100644 --- a/src/formula/function.cpp +++ b/src/formula/function.cpp @@ -86,7 +86,7 @@ private: std::shared_ptr fdbp; bool need_wrapper = false; if (fdb==nullptr) { - fdbp = std::shared_ptr(new formula_debugger()); + fdbp.reset(new formula_debugger()); fdb = &*fdbp; need_wrapper = true; diff --git a/src/reports.cpp b/src/reports.cpp index 027b7aac855..cab376a0544 100644 --- a/src/reports.cpp +++ b/src/reports.cpp @@ -1554,7 +1554,7 @@ REPORT_GENERATOR(report_countdown, rc) void reports::register_generator(const std::string &name, reports::generator *g) { - dynamic_generators_[name] = std::shared_ptr(g); + dynamic_generators_[name].reset(g); } config reports::generate_report(const std::string &name, reports::context & rc, bool only_static) diff --git a/src/synced_context.cpp b/src/synced_context.cpp index 215e1f4af68..2be805018e0 100644 --- a/src/synced_context.cpp +++ b/src/synced_context.cpp @@ -257,11 +257,11 @@ std::shared_ptr synced_context::get_rng_for_action() const std::string& mode = resources::classification->random_mode; if(mode == "deterministic") { - return std::shared_ptr(new randomness::rng_deterministic(resources::gamedata->rng())); + return std::make_shared(resources::gamedata->rng()); } else { - return std::shared_ptr(new randomness::synced_rng(generate_random_seed)); + return std::make_shared(generate_random_seed); } } diff --git a/src/utils/name_generator_factory.cpp b/src/utils/name_generator_factory.cpp index 6938ba4c8ba..5cab51fd81f 100644 --- a/src/utils/name_generator_factory.cpp +++ b/src/utils/name_generator_factory.cpp @@ -38,7 +38,7 @@ void name_generator_factory::add_name_generator_from_config(const config& config if(config.has_attribute(cfg_name)) { try { - name_generators_[id] = std::shared_ptr(new context_free_grammar_generator(config[cfg_name])); + name_generators_[id].reset(new context_free_grammar_generator(config[cfg_name])); return; } catch (const name_generator_invalid_exception& ex) { @@ -50,7 +50,7 @@ void name_generator_factory::add_name_generator_from_config(const config& config config::attribute_value markov_name_list = config[markov_name]; if(!markov_name_list.blank()) { - name_generators_[id] = std::shared_ptr(new markov_generator(utils::split(markov_name_list), config["markov_chain_size"].to_int(2), 12)); + name_generators_[id].reset(new markov_generator(utils::split(markov_name_list), config["markov_chain_size"].to_int(2), 12)); } } } @@ -59,7 +59,7 @@ std::shared_ptr name_generator_factory::get_name_generator() { std::map>::const_iterator it = name_generators_.find(""); if(it == name_generators_.end()) { //create a dummy instance, which always returns the empty string - return std::shared_ptr(new name_generator( )); + return std::make_shared(); } return it->second; diff --git a/src/whiteboard/manager.cpp b/src/whiteboard/manager.cpp index f6850472acd..082608e9828 100644 --- a/src/whiteboard/manager.cpp +++ b/src/whiteboard/manager.cpp @@ -1232,7 +1232,7 @@ future_map_if_active::~future_map_if_active() real_map::real_map(): initial_planned_unit_map_(resources::whiteboard && resources::whiteboard->has_planned_unit_map()), - unit_map_lock_(resources::whiteboard ? resources::whiteboard->unit_map_lock_ : std::shared_ptr(new bool(false))) + unit_map_lock_(resources::whiteboard ? resources::whiteboard->unit_map_lock_ : std::make_shared(false)) { if (!resources::whiteboard) return;