0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Whiteboard: avoid the use of a deprecated C++17 function

Browse source 
shared_ptr::unique() is equivalent to use_count() == 1. A few of these checks should probably
be > 1 to account for 0, but this is a direct logical translation.
This commit is contained in:
Charles Dang 2018-05-11 16:10:56 +11:00
parent 1c575f59fa
commit f279ad5fc0
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/movetype.cpp
View file

@ -514,7 +514,7 @@ void movetype::terrain_info::merge(const config & new_values, bool overwrite)
merged_data_.reset();
// Copy-on-write.
if ( !data_.unique() ) {
if(data_.use_count() != 1) {
data_.reset(new data(*data_));
// We also need to make copies of our fallback and cascade.
// This is to keep the caching manageable, as this means each
@ -593,7 +593,7 @@ const std::shared_ptr<movetype::terrain_info::data> &
*/
void movetype::terrain_info::make_unique_cascade() const
{
if ( !data_.unique() )
if(data_.use_count() != 1)
// Const hack because this is not really changing the data.
const_cast<terrain_info *>(this)->data_.reset(new data(*data_));
@ -607,7 +607,7 @@ void movetype::terrain_info::make_unique_cascade() const
*/
void movetype::terrain_info::make_unique_fallback() const
{
if ( !data_.unique() )
if(data_.use_count() != 1)
// Const hack because this is not really changing the data.
const_cast<terrain_info *>(this)->data_.reset(new data(*data_));

10
src/whiteboard/manager.cpp
View file

@ -163,7 +163,7 @@ bool manager::can_modify_game_state() const
bool manager::can_activate() const
{
//any more than one reference means a lock on whiteboard state was requested
if(!activation_state_lock_.unique())
if(activation_state_lock_.use_count() != 1)
return false;
return can_modify_game_state();
@ -202,7 +202,7 @@ void manager::set_active(bool active)
void manager::set_invert_behavior(bool invert)
{
//any more than one reference means a lock on whiteboard state was requested
if(!activation_state_lock_.unique())
if(activation_state_lock_.use_count() != 1)
return;
bool block_whiteboard_activation = false;
@ -272,7 +272,7 @@ bool manager::allow_leader_to_move(const unit& leader) const
//Look for another leader on another keep in the same castle
{ wb::future_map future; // start planned unit map scope
// TODO: when the game executes all whiteboard moves at turn end applying the future map
// will fail because we are currently executing actions, and if one of those actions
// was a movement of the leader this function will be called, resulting the the error
@ -537,7 +537,7 @@ namespace
void manager::pre_draw()
{
if (can_modify_game_state() && has_actions() && unit_map_lock_.unique()) {
if (can_modify_game_state() && has_actions() && unit_map_lock_.use_count() == 1) {
move_owners_finder move_finder;
for_each_action(std::ref(move_finder));
units_owning_moves_ = move_finder.get_units_owning_moves();
@ -1160,7 +1160,7 @@ void manager::set_planned_unit_map()
return;
}
//any more than one reference means a lock on unit map was requested
if(!unit_map_lock_.unique()) {
if(unit_map_lock_.use_count() != 1) {
LOG_WB << "Not building planned unit map: unit map locked.\n";
return;
}