From 532731e6f4c0d843d355ff8f2d9f63e4e7854e6a Mon Sep 17 00:00:00 2001 From: bibo38 Date: Thu, 21 Dec 2017 12:36:58 +0100 Subject: Fixed Clang 5.0 compile errors (#4085) * Fixed Clang 5.0 compile errors * Fixed wrong comment * Only disable warnings in Clang 5 or higher * Added a CMake condition for the Clang 5 no-zero-as-null-pointer-constant warning * Now using the use_nullptr branch of the Cuberite specific SQLiteCpp fork --- src/FurnaceRecipe.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/FurnaceRecipe.cpp') diff --git a/src/FurnaceRecipe.cpp b/src/FurnaceRecipe.cpp index d7e69b181..4e7f13e6a 100644 --- a/src/FurnaceRecipe.cpp +++ b/src/FurnaceRecipe.cpp @@ -272,7 +272,7 @@ void cFurnaceRecipe::ClearRecipes(void) const cFurnaceRecipe::cRecipe * cFurnaceRecipe::GetRecipeFrom(const cItem & a_Ingredient) const { - const cRecipe * BestRecipe = 0; + const cRecipe * BestRecipe = nullptr; for (RecipeList::const_iterator itr = m_pState->Recipes.begin(); itr != m_pState->Recipes.end(); ++itr) { const cRecipe & Recipe = *itr; -- cgit v1.2.3