diff options
| author | 2021-05-16 01:46:30 -0400 | |
|---|---|---|
| committer | 2021-05-16 03:43:16 -0400 | |
| commit | 9a07ed53ebe4e27ef1a14e0469037cab9fb7b1e7 (patch) | |
| tree | 54d6c5a6b319a10522b068caf2b0600c8f27876a /src/core/hle/service/service.h | |
| parent | Merge pull request #6316 from ameerj/title-fix (diff) | |
| download | yuzu-9a07ed53ebe4e27ef1a14e0469037cab9fb7b1e7.tar.gz yuzu-9a07ed53ebe4e27ef1a14e0469037cab9fb7b1e7.tar.xz yuzu-9a07ed53ebe4e27ef1a14e0469037cab9fb7b1e7.zip | |
core: Make variable shadowing a compile-time error
Now that we have most of core free of shadowing, we can enable the
warning as an error to catch anything that may be remaining and also
eliminate this class of logic bug entirely.
Diffstat (limited to 'src/core/hle/service/service.h')
| -rw-r--r-- | src/core/hle/service/service.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 3dfb0740a..4c048173b 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h | |||
| @@ -155,17 +155,17 @@ protected: | |||
| 155 | /** | 155 | /** |
| 156 | * Constructs a FunctionInfo for a function. | 156 | * Constructs a FunctionInfo for a function. |
| 157 | * | 157 | * |
| 158 | * @param expected_header request header in the command buffer which will trigger dispatch | 158 | * @param expected_header_ request header in the command buffer which will trigger dispatch |
| 159 | * to this handler | 159 | * to this handler |
| 160 | * @param handler_callback member function in this service which will be called to handle | 160 | * @param handler_callback_ member function in this service which will be called to handle |
| 161 | * the request | 161 | * the request |
| 162 | * @param name human-friendly name for the request. Used mostly for logging purposes. | 162 | * @param name_ human-friendly name for the request. Used mostly for logging purposes. |
| 163 | */ | 163 | */ |
| 164 | FunctionInfo(u32 expected_header, HandlerFnP<Self> handler_callback, const char* name) | 164 | FunctionInfo(u32 expected_header_, HandlerFnP<Self> handler_callback_, const char* name_) |
| 165 | : FunctionInfoBase{ | 165 | : FunctionInfoBase{ |
| 166 | expected_header, | 166 | expected_header_, |
| 167 | // Type-erase member function pointer by casting it down to the base class. | 167 | // Type-erase member function pointer by casting it down to the base class. |
| 168 | static_cast<HandlerFnP<ServiceFrameworkBase>>(handler_callback), name} {} | 168 | static_cast<HandlerFnP<ServiceFrameworkBase>>(handler_callback_), name_} {} |
| 169 | }; | 169 | }; |
| 170 | 170 | ||
| 171 | /** | 171 | /** |