swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-21 11:02:58 -04:00
Code Issues Projects Releases Wiki Activity

newer standards prefer nullptr over NULL - this is most of them but there are others too

Browse Source
This commit is contained in:
DarthArgus
2016-02-15 00:07:31 -06:00
parent 6bb5137dc4
commit 03dc62efba
937 changed files with 14983 additions and 14983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/CommoditiesServer/src/shared/AuctionLocation.cpp
+3 -3
View File
@@ -137,7 +137,7 @@ AuctionLocation::~AuctionLocation()
bool AuctionLocation::AddAuction(Auction *auction)
{
assert(auction != NULL);
assert(auction != nullptr);
if (IsVendorMarket() &&
(!auction->IsActive() || !IsOwner(auction->GetCreatorId())))
{
@@ -189,7 +189,7 @@ void AuctionLocation::CancelVendorSale(Auction *auction)
bool AuctionLocation::RemoveAuction(Auction *auction)
{
assert(auction != NULL);
assert(auction != nullptr);
return RemoveAuction(auction->GetItem().GetItemId());
}
@@ -265,7 +265,7 @@ Auction *AuctionLocation::GetAuction(const NetworkId & itemId)
return((*i).second);
}
}
return NULL;
return nullptr;
}
// ----------------------------------------------------------------------