flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Replaced auto_ptr with unique_ptr.

Browse Source
This commit is contained in:
Mattes D 2014-11-27 21:27:03 +01:00
parent 61ce09e4d0
commit 186b2f3bd0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CraftingRecipes.cpp
View File

@ -289,7 +289,7 @@ void cCraftingRecipes::GetRecipe(cPlayer & a_Player, cCraftingGrid & a_CraftingG
} }
// Built-in recipes: // Built-in recipes:
std::auto_ptr<cRecipe> Recipe(FindRecipe(a_CraftingGrid.GetItems(), a_CraftingGrid.GetWidth(), a_CraftingGrid.GetHeight())); std::unique_ptr<cRecipe> Recipe(FindRecipe(a_CraftingGrid.GetItems(), a_CraftingGrid.GetWidth(), a_CraftingGrid.GetHeight()));
a_Recipe.Clear(); a_Recipe.Clear();
if (Recipe.get() == nullptr) if (Recipe.get() == nullptr)
{ {
@ -377,7 +377,7 @@ void cCraftingRecipes::AddRecipeLine(int a_LineNum, const AString & a_RecipeLine
return; return;
} }
std::auto_ptr<cCraftingRecipes::cRecipe> Recipe(new cCraftingRecipes::cRecipe); std::unique_ptr<cCraftingRecipes::cRecipe> Recipe(new cCraftingRecipes::cRecipe);
// Parse the result: // Parse the result:
AStringVector ResultSplit = StringSplit(Sides[0], ","); AStringVector ResultSplit = StringSplit(Sides[0], ",");
@ -758,7 +758,7 @@ cCraftingRecipes::cRecipe * cCraftingRecipes::MatchRecipe(const cItem * a_Crafti
} // for y, for x } // for y, for x
// The recipe has matched. Create a copy of the recipe and set its coords to match the crafting grid: // The recipe has matched. Create a copy of the recipe and set its coords to match the crafting grid:
std::auto_ptr<cRecipe> Recipe(new cRecipe); std::unique_ptr<cRecipe> Recipe(new cRecipe);
Recipe->m_Result = a_Recipe->m_Result; Recipe->m_Result = a_Recipe->m_Result;
Recipe->m_Width = a_Recipe->m_Width; Recipe->m_Width = a_Recipe->m_Width;
Recipe->m_Height = a_Recipe->m_Height; Recipe->m_Height = a_Recipe->m_Height;

6
src/FurnaceRecipe.cpp
View File

@ -115,7 +115,7 @@ void cFurnaceRecipe::AddFuelFromLine(const AString & a_Line, unsigned int a_Line
Line.erase(Line.begin()); // Remove the beginning "!" Line.erase(Line.begin()); // Remove the beginning "!"
Line.erase(std::remove_if(Line.begin(), Line.end(), isspace), Line.end()); Line.erase(std::remove_if(Line.begin(), Line.end(), isspace), Line.end());
std::auto_ptr<cItem> Item(new cItem); std::unique_ptr<cItem> Item(new cItem);
int BurnTime; int BurnTime;
const AStringVector & Sides = StringSplit(Line, "="); const AStringVector & Sides = StringSplit(Line, "=");
@ -157,8 +157,8 @@ void cFurnaceRecipe::AddRecipeFromLine(const AString & a_Line, unsigned int a_Li
Line.erase(std::remove_if(Line.begin(), Line.end(), isspace), Line.end()); Line.erase(std::remove_if(Line.begin(), Line.end(), isspace), Line.end());
int CookTime = 200; int CookTime = 200;
std::auto_ptr<cItem> InputItem(new cItem()); std::unique_ptr<cItem> InputItem(new cItem());
std::auto_ptr<cItem> OutputItem(new cItem()); std::unique_ptr<cItem> OutputItem(new cItem());
const AStringVector & Sides = StringSplit(Line, "="); const AStringVector & Sides = StringSplit(Line, "=");
if (Sides.size() != 2) if (Sides.size() != 2)