From 1452bb7ab1d10039b55dcba5dc09e47200dcc598 Mon Sep 17 00:00:00 2001

From: Maxime Bouillot <maxbouillot@gmail.com>

Date: Mon, 8 May 2023 12:07:35 +0200

Subject: [PATCH] Rename variable called requires

Forwarded: https://github.com/CleverRaven/Cataclysm-DDA/pull/65542

As this is a keyword in C++20, it should be used

to name a variable.

---

 src/faction_camp.cpp | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/faction_camp.cpp b/src/faction_camp.cpp

index c952552d5f35f..9a2e12c4b2c33 100644

--- a/src/faction_camp.cpp

+++ b/src/faction_camp.cpp

@@ -2575,8 +2575,8 @@ static int salt_water_pipe_segment_of( const recipe &making );

 int salt_water_pipe_segment_of( const recipe &making )

 {

     int segment_number = -1;

-    const auto &requires = making.blueprint_requires();

-    for( auto const &element : requires ) {

+    const auto &requirements = making.blueprint_requires();

+    for( auto const &element : requirements ) {

         if( element.first.substr( 0, salt_water_pipe_string_base.length() ) == salt_water_pipe_string_base

             &&

             element.first.substr( element.first.length() - salt_water_pipe_string_suffix.length(),